diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-06-20 14:26:05 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-06-20 14:26:05 +0000 |
| commit | 52cf538fff104699218411cd1d89a71c050038bd (patch) | |
| tree | c348e1bf1f41d1d8ddf1295dc1feee2a17d9f95f /cpp/config/IceGridAdmin.py | |
| parent | some updates for making components more generic across targets and cleanup (diff) | |
| download | ice-52cf538fff104699218411cd1d89a71c050038bd.tar.bz2 ice-52cf538fff104699218411cd1d89a71c050038bd.tar.xz ice-52cf538fff104699218411cd1d89a71c050038bd.zip | |
Fix for bug 1093
Diffstat (limited to 'cpp/config/IceGridAdmin.py')
| -rw-r--r-- | cpp/config/IceGridAdmin.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpp/config/IceGridAdmin.py b/cpp/config/IceGridAdmin.py index 28a3bdb4c65..e95630c2813 100644 --- a/cpp/config/IceGridAdmin.py +++ b/cpp/config/IceGridAdmin.py @@ -42,6 +42,7 @@ registryOptions = r' --Ice.Warn.Connections=0' + \ r' --IceGrid.Registry.Admin.Endpoints=default' + \ r' --IceGrid.Registry.Trace.Session=0' + \ r' --IceGrid.Registry.Trace.Application=0' + \ + r' --IceGrid.Registry.Trace.Node=0' + \ r' --IceGrid.Registry.Trace.Adapter=0' + \ r' --IceGrid.Registry.Trace.Object=0' + \ r' --IceGrid.Registry.Trace.Server=0' + \ @@ -119,7 +120,7 @@ def iceGridAdmin(cmd, ignoreFailure = False): output = iceGridAdminPipe.readlines() - iceGridAdminStatus = iceGridAdminPipe.close() + iceGridAdminStatus = TestUtil.closePipe(iceGridAdminPipe) if not ignoreFailure and iceGridAdminStatus: print "icegridadmin command failed: " + cmd TestUtil.killServers() |