diff options
author | Benoit Foucher <benoit@zeroc.com> | 2014-07-25 11:54:05 +0200 |
---|---|---|
committer | Benoit Foucher <benoit@zeroc.com> | 2014-07-25 11:54:05 +0200 |
commit | 78aa45dcf75316fc2db511938b7c8249511e54ca (patch) | |
tree | b68cda42fe86a4b868b7e72de55aea4d00dba26b /cpp/src/IceGrid/ServerI.cpp | |
parent | Build fixes for MinGW 4.7.2-32 (diff) | |
download | ice-78aa45dcf75316fc2db511938b7c8249511e54ca.tar.bz2 ice-78aa45dcf75316fc2db511938b7c8249511e54ca.tar.xz ice-78aa45dcf75316fc2db511938b7c8249511e54ca.zip |
Improved IceGrid discovery, it now works with icegrid registry slaves and nodes
Diffstat (limited to 'cpp/src/IceGrid/ServerI.cpp')
-rw-r--r-- | cpp/src/IceGrid/ServerI.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index 33df2ed49e1..0234020b553 100644 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -3174,9 +3174,20 @@ ServerI::getProperties(const InternalServerDescriptorPtr& desc) { if(getProperty(p->second, "Ice.Default.Locator").empty()) { - p->second.push_back( - createProperty("Ice.Default.Locator", - _node->getCommunicator()->getProperties()->getProperty("Ice.Default.Locator"))); + Ice::PropertiesPtr properties = _node->getCommunicator()->getProperties(); + + string locator = properties->getProperty("Ice.Default.Locator"); + if(!locator.empty()) + { + p->second.push_back(createProperty("Ice.Default.Locator", locator)); + } + + string discoveryPlugin = properties->getProperty("Ice.Plugin.IceGridDiscovery"); + if(!discoveryPlugin.empty()) + { + p->second.push_back(createProperty("Ice.Plugin.IceGridDiscovery", discoveryPlugin)); + p->second.push_back(createProperty("IceGridDiscovery.InstanceName", _node->getInstanceName())); + } } if(!overrides.empty()) |