diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2008-04-25 12:25:28 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2008-04-25 12:25:28 +0200 |
| commit | 9ed9d3b18e2040091056ed3e10c52877a1edcc98 (patch) | |
| tree | 6f4d5eff20a82b367218f3655bcee97289037a18 /cpp/src/IceGrid/NodeCache.cpp | |
| parent | http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=3025 - Bogus IceStorm Make... (diff) | |
| download | ice-9ed9d3b18e2040091056ed3e10c52877a1edcc98.tar.bz2 ice-9ed9d3b18e2040091056ed3e10c52877a1edcc98.tar.xz ice-9ed9d3b18e2040091056ed3e10c52877a1edcc98.zip | |
Fixed bug 3039
Diffstat (limited to 'cpp/src/IceGrid/NodeCache.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeCache.cpp | 23 |
1 files changed, 19 insertions, 4 deletions
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp index 7e193f1f601..5bdb1e12b75 100644 --- a/cpp/src/IceGrid/NodeCache.cpp +++ b/cpp/src/IceGrid/NodeCache.cpp @@ -897,15 +897,26 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const iceVersion = getMMVersion(info.descriptor->iceVersion); } + server->processRegistered = false; if(iceVersion == 0 || iceVersion >= 30300) { props.push_back(createProperty("Ice.Admin.ServerId", info.descriptor->id)); - server->processRegistered = getProperty(info.descriptor->propertySet.properties, "Ice.Admin.Endpoints") != ""; + if(hasProperty(info.descriptor->propertySet.properties, "Ice.Admin.Endpoints")) + { + if(getProperty(info.descriptor->propertySet.properties, "Ice.Admin.Endpoints") != "") + { + server->processRegistered = true; + } + } + else + { + props.push_back(createProperty("Ice.Admin.Endpoints", "tcp -h 127.0.0.1")); + server->processRegistered = true; + } } else { props.push_back(createProperty("Ice.ServerId", info.descriptor->id)); - server->processRegistered = false; // Assigned for each communicator (see below) } props.push_back(createProperty("Ice.ProgramName", info.descriptor->id)); @@ -924,11 +935,15 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const props.push_back(createProperty("IceBox.Service." + s->name, s->entry + " --Ice.Config=\"" + path + "\"")); servicesStr += s->name + " "; } + if(!hasProperty(info.descriptor->propertySet.properties, "IceBox.InstanceName")) + { + props.push_back(createProperty("IceBox.InstanceName", server->id)); + } props.push_back(createProperty("IceBox.LoadOrder", servicesStr)); if(iceVersion != 0 && iceVersion < 30300) { - if(isSet(iceBox->propertySet.properties, "IceBox.ServiceManager.RegisterProcess")) + if(hasProperty(iceBox->propertySet.properties, "IceBox.ServiceManager.RegisterProcess")) { if(getProperty(iceBox->propertySet.properties, "IceBox.ServiceManager.RegisterProcess") != "0") { @@ -940,7 +955,7 @@ NodeEntry::getInternalServerDescriptor(const ServerInfo& info) const props.push_back(createProperty("IceBox.ServiceManager.RegisterProcess", "1")); server->processRegistered = true; } - if(!isSet(iceBox->propertySet.properties, "IceBox.ServiceManager.Endpoints")) + if(!hasProperty(iceBox->propertySet.properties, "IceBox.ServiceManager.Endpoints")) { props.push_back(createProperty("IceBox.ServiceManager.Endpoints", "tcp -h 127.0.0.1")); } |