diff options
| author | Joe George <joe@zeroc.com> | 2021-02-02 11:31:50 -0500 |
|---|---|---|
| committer | Joe George <joe@zeroc.com> | 2021-02-02 11:31:50 -0500 |
| commit | 8c8d242f6c31a2bcec1eddb2f39c2ca411079d9c (patch) | |
| tree | 81865e431a54de6fc9807a7a6f74197e26b29bdc /cpp/src/IceGrid/NodeCache.cpp | |
| parent | Update Glacier2 tests to use C++11 mapping (diff) | |
| download | ice-8c8d242f6c31a2bcec1eddb2f39c2ca411079d9c.tar.bz2 ice-8c8d242f6c31a2bcec1eddb2f39c2ca411079d9c.tar.xz ice-8c8d242f6c31a2bcec1eddb2f39c2ca411079d9c.zip | |
IceGrid and IceStorm fixes
Diffstat (limited to 'cpp/src/IceGrid/NodeCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index 8d397255f72..67512bcd4de 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -764,8 +764,7 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const } else { - props.push_back(createProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1")); - props.push_back(createProperty("Ice.Admin.ServerName", "127.0.0.1")); + props.push_back(createProperty("Ice.Admin.Endpoints", "tcp -h localhost")); server->processRegistered = true; } } @@ -811,6 +810,31 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const } props.push_back(createProperty("IceBox.LoadOrder", servicesStr)); + + if(iceVersion != 0 && iceVersion < 30300) + { + if(hasProperty(iceBox->propertySet.properties, "IceBox.ServiceManager.RegisterProcess")) + { + if(getProperty(iceBox->propertySet.properties, "IceBox.ServiceManager.RegisterProcess") != "0") + { + server->processRegistered = true; + } + } + else + { + props.push_back(createProperty("IceBox.ServiceManager.RegisterProcess", "1")); + server->processRegistered = true; + } + if(!hasProperty(iceBox->propertySet.properties, "IceBox.ServiceManager.Endpoints")) + { + props.push_back(createProperty("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1")); + } + } + if(!hasProperty(info.descriptor->propertySet.properties, "IceBox.InstanceName") && + hasProperty(iceBox->propertySet.properties, "IceBox.ServiceManager.Endpoints")) + { + props.push_back(createProperty("IceBox.InstanceName", server->id)); + } } // |