diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-12-13 14:04:11 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-12-13 14:04:11 +0000 |
| commit | 8642754fe313e1df2cd28bb45a3cb278eab170a4 (patch) | |
| tree | 4f722789a0cefc24412e3d2f77621bb8f56facb1 /cpp/config/IceGridAdmin.py | |
| parent | Fixed bug #1610 (diff) | |
| download | ice-8642754fe313e1df2cd28bb45a3cb278eab170a4.tar.bz2 ice-8642754fe313e1df2cd28bb45a3cb278eab170a4.tar.xz ice-8642754fe313e1df2cd28bb45a3cb278eab170a4.zip | |
Added support for server log files, "property" attribute in object element.
Fixed a bug in the locator implemntation where an incorrect timeout was
used.
Diffstat (limited to 'cpp/config/IceGridAdmin.py')
| -rw-r--r-- | cpp/config/IceGridAdmin.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/cpp/config/IceGridAdmin.py b/cpp/config/IceGridAdmin.py index 372971e8b79..e1933b29af1 100644 --- a/cpp/config/IceGridAdmin.py +++ b/cpp/config/IceGridAdmin.py @@ -58,6 +58,7 @@ registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.Trace.Locator=0' + \ r' --Ice.ThreadPool.Server.Size=0 ' + \ r' --Ice.ThreadPool.Client.SizeWarn=0' + \ + r' --IceGrid.Registry.Client.ThreadPool.SizeWarn=0' + \ r' --Ice.ServerIdleTime=0' + \ r' --IceGrid.Registry.DefaultTemplates=' + os.path.join(toplevel, "config", "templates.xml") @@ -174,10 +175,8 @@ def iceGridAdmin(cmd, ignoreFailure = False): iceGridAdminPipe = os.popen(command + " 2>&1") output = iceGridAdminPipe.readlines() - iceGridAdminStatus = TestUtil.closePipe(iceGridAdminPipe) if not ignoreFailure and iceGridAdminStatus: - print "icegridadmin command failed: " + cmd for line in output: print line TestUtil.killServers() |