diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-04-05 12:54:15 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-04-05 12:54:15 +0000 |
| commit | 872fd9e5dfb743a648c64bf774f6c9a76a45b651 (patch) | |
| tree | c071c5dc5bd1177c0913e82cb8a3233f0da50ea6 /cpp/config/IceGridAdmin.py | |
| parent | adding timeout test (diff) | |
| download | ice-872fd9e5dfb743a648c64bf774f6c9a76a45b651.tar.bz2 ice-872fd9e5dfb743a648c64bf774f6c9a76a45b651.tar.xz ice-872fd9e5dfb743a648c64bf774f6c9a76a45b651.zip | |
- Added support for observing adapters and objects.
- Lots of cleanup in the IceGrid registry initilization method.
Diffstat (limited to 'cpp/config/IceGridAdmin.py')
| -rw-r--r-- | cpp/config/IceGridAdmin.py | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/cpp/config/IceGridAdmin.py b/cpp/config/IceGridAdmin.py index d48193fe3fd..a2762a2b3b6 100644 --- a/cpp/config/IceGridAdmin.py +++ b/cpp/config/IceGridAdmin.py @@ -29,7 +29,8 @@ nodeOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Node.Trace.Adapter=0' + \ r' --IceGrid.Node.Trace.Server=0' + \ r' --IceGrid.Node.PrintServersReady=node' + \ - r' --Ice.NullHandleAbort'; + r' --Ice.NullHandleAbort' + \ + r' --Ice.ThreadPool.Server.Size=0'; registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.Server.Endpoints=default' + \ @@ -37,7 +38,12 @@ registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.Admin.Endpoints=default' + \ r' --IceGrid.Registry.Server.Endpoints=default' + \ r' --IceGrid.Registry.Internal.Endpoints=default' + \ - r' --IceGrid.Registry.Admin.Endpoints=default'; + r' --IceGrid.Registry.Admin.Endpoints=default' + \ + r' --IceGrid.Registry.Trace.Application=0' + \ + r' --IceGrid.Registry.Trace.Adapter=0' + \ + r' --IceGrid.Registry.Trace.Object=0' + \ + r' --IceGrid.Registry.Trace.Server=0' + \ + r' --Ice.ThreadPool.Server.Size=0'; class ReaderThread(Thread): def __init__(self, pipe, token): @@ -102,7 +108,8 @@ def startIceGridNode(testdir): os.mkdir(dataDir) overrideOptions = '"' + TestUtil.clientServerOptions.replace("--", "") + \ - ' Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0' + '"' + ' Ice.ServerIdleTime=0 Ice.PrintProcessId=0 Ice.PrintAdapterReady=0 ' + \ + ' Ice.ThreadPool.Server.Size=0"' print "starting icegrid node...", command = iceGrid + TestUtil.clientServerOptions + ' --nowarn ' + nodeOptions + \ @@ -110,7 +117,7 @@ def startIceGridNode(testdir): r' --IceGrid.Node.Data=' + dataDir + \ r' --IceGrid.Node.Name=localnode' + \ r' --IceGrid.Node.PropertiesOverride=' + overrideOptions - + (stdin, iceGridPipe) = os.popen4(command) TestUtil.getServerPid(iceGridPipe) TestUtil.getAdapterReady(iceGridPipe) |