diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2017-05-10 22:00:52 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2017-05-10 22:00:52 +0200 |
| commit | 8d04ccdca27f1198713f173729a13980f60ff795 (patch) | |
| tree | 62cd717edd136eee6570fd8456f47e80ae2cb718 /scripts/IceGridUtil.py | |
| parent | Fixed ICE-7869 - IceGridGUI NPE (diff) | |
| download | ice-8d04ccdca27f1198713f173729a13980f60ff795.tar.bz2 ice-8d04ccdca27f1198713f173729a13980f60ff795.tar.xz ice-8d04ccdca27f1198713f173729a13980f60ff795.zip | |
Fix for IceDiscovery/IceLocatorDiscovery Linux failures
Diffstat (limited to 'scripts/IceGridUtil.py')
| -rw-r--r-- | scripts/IceGridUtil.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py index c981b63eaae..7af2d88383b 100644 --- a/scripts/IceGridUtil.py +++ b/scripts/IceGridUtil.py @@ -146,7 +146,6 @@ class IceGridRegistry(ProcessFromBinDir, Server): 'IceGrid.Registry.Internal.Endpoints' : 'default', 'IceGrid.Registry.Client.Endpoints' : self.getEndpoints(current), 'IceGrid.Registry.Discovery.Port' : current.driver.getTestPort(99), - "IceGrid.Registry.Discovery.Interface": "::1" if current.config.ipv6 else "127.0.0.1", 'IceGrid.Registry.SessionManager.Endpoints' : 'default', 'IceGrid.Registry.AdminSessionManager.Endpoints' : 'default', 'IceGrid.Registry.SessionTimeout' : 60, @@ -161,6 +160,8 @@ class IceGridRegistry(ProcessFromBinDir, Server): 'IceGrid.Registry.DefaultTemplates' : '"' + os.path.abspath(os.path.join(toplevel, "cpp", "config", "templates.xml")) + '"' } + if not isinstance(platform, Linux): + props["IceGrid.Registry.Discovery.Interface"] = "::1" if current.config.ipv6 else "127.0.0.1" return props def getEndpoints(self, current): |