diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2004-02-19 16:24:46 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2004-02-19 16:24:46 +0000 |
| commit | 46b7c3565ff6785144f1807782276edbc29e5b9d (patch) | |
| tree | ff73ec6c2cebd4a05ffb1d7527debb9704744bcb /cpp/src | |
| parent | fix (diff) | |
| download | ice-46b7c3565ff6785144f1807782276edbc29e5b9d.tar.bz2 ice-46b7c3565ff6785144f1807782276edbc29e5b9d.tar.xz ice-46b7c3565ff6785144f1807782276edbc29e5b9d.zip | |
IcePack fixes
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IcePack/IcePackNode.cpp | 7 | ||||
| -rw-r--r-- | cpp/src/IcePack/Registry.cpp | 9 |
2 files changed, 13 insertions, 3 deletions
diff --git a/cpp/src/IcePack/IcePackNode.cpp b/cpp/src/IcePack/IcePackNode.cpp index 9bf09710a4f..0ef1bdb3e6d 100644 --- a/cpp/src/IcePack/IcePackNode.cpp +++ b/cpp/src/IcePack/IcePackNode.cpp @@ -179,6 +179,11 @@ IcePack::NodeService::start(int argc, char* argv[]) // properties->setProperty("Ice.ServerIdleTime", "0"); + if(properties->getPropertyAsIntWithDefault("Ice.ThreadPool.Server.Size", 5) <= 5) + { + properties->setProperty("Ice.ThreadPool.Server.Size", "5"); + } + // // Collocate the IcePack registry if we need to. // @@ -196,7 +201,7 @@ IcePack::NodeService::start(int argc, char* argv[]) // if(properties->getPropertyAsInt("IcePack.Node.ThreadPool.Size") == 0) { - int size = properties->getPropertyAsIntWithDefault("Ice.ThreadPool.Server.Size", 10); + int size = properties->getPropertyAsInt("Ice.ThreadPool.Server.Size"); ostringstream os1; os1 << static_cast<int>(size / 3); diff --git a/cpp/src/IcePack/Registry.cpp b/cpp/src/IcePack/Registry.cpp index b705bc990f5..295057fcf23 100644 --- a/cpp/src/IcePack/Registry.cpp +++ b/cpp/src/IcePack/Registry.cpp @@ -121,11 +121,17 @@ IcePack::Registry::start(bool nowarn, bool requiresInternalEndpoints) out << "administrative endpoints `IcePack.Registry.Admin.Endpoints' enabled"; } } - + + if(properties->getPropertyAsIntWithDefault("Ice.ThreadPool.Server.Size", 5) <= 5) + { + properties->setProperty("Ice.ThreadPool.Server.Size", "5"); + } + _communicator->setDefaultLocator(0); properties->setProperty("Ice.PrintProcessId", "0"); properties->setProperty("Ice.Warn.Leaks", "0"); + properties->setProperty("Ice.ServerIdleTime", "0"); TraceLevelsPtr traceLevels = new TraceLevels(properties, _communicator->getLogger()); @@ -154,7 +160,6 @@ IcePack::Registry::start(bool nowarn, bool requiresInternalEndpoints) registryAdapter->add(serverRegistry, stringToIdentity("IcePack/ServerRegistry")); registryAdapter->add(nodeRegistry, stringToIdentity("IcePack/NodeRegistry")); - // // Create the locator registry adapter and servant. // |