diff options
| author | Mark Spruiell <mes@zeroc.com> | 2004-01-26 18:08:38 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2004-01-26 18:08:38 +0000 |
| commit | 0f55d8cc0a0eeeccb7c0d70f655628a07594f1c1 (patch) | |
| tree | cd3062672aa1ba548326364bb2e4dd22ffd0a7cd /cpp/src/Ice/Instance.cpp | |
| parent | fix (diff) | |
| download | ice-0f55d8cc0a0eeeccb7c0d70f655628a07594f1c1.tar.bz2 ice-0f55d8cc0a0eeeccb7c0d70f655628a07594f1c1.tar.xz ice-0f55d8cc0a0eeeccb7c0d70f655628a07594f1c1.zip | |
removing Ice.Daemon
Diffstat (limited to 'cpp/src/Ice/Instance.cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 36 |
1 files changed, 2 insertions, 34 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 6e674643492..775ef98880f 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -630,34 +630,8 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[]) LocatorPrx::uncheckedCast(_proxyFactory->stringToProxy(_defaultsAndOverrides->defaultLocator))); } -#if !defined(_WIN32) && !defined(__sun) && !defined(__hpux) // - // daemon() must be called after any plug-ins have been - // installed. For example, an SSL plug-in might want to - // read a passphrase from standard input. - // - // TODO: This is a problem for plug-ins that open files, create - // threads, etc. Perhaps we need a two-stage plug-in - // initialization? - // - if(_properties->getPropertyAsInt("Ice.Daemon") > 0) - { - int noclose = _properties->getPropertyAsInt("Ice.DaemonNoClose"); - int nochdir = _properties->getPropertyAsInt("Ice.DaemonNoChdir"); - - if(daemon(nochdir, noclose) == -1) - { - SyscallException ex(__FILE__, __LINE__); - ex.error = getSystemErrno(); - throw ex; - } - } -#endif - - // - // Must be done after daemon() is called, since daemon() - // forks. Does not work together with Ice.Daemon if - // Ice.DaemonNoClose is not set. + // Show process id if requested. // if(_properties->getPropertyAsInt("Ice.PrintProcessId") > 0) { @@ -669,8 +643,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[]) } // - // Connection monitor initializations must be done after daemon() - // is called, since daemon() forks. + // Start connection monitor if necessary. // int acmTimeout = _properties->getPropertyAsInt("Ice.ConnectionIdleTime"); int interval = _properties->getPropertyAsIntWithDefault("Ice.MonitorConnections", acmTimeout); @@ -680,11 +653,6 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[]) } // - // Thread pool initializations must be done after daemon() is - // called, since daemon() forks. - // - - // // Thread pool initialization is now lazy initialization in // clientThreadPool() and serverThreadPool(). // |