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/NodeI.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/NodeI.cpp')
| -rw-r--r-- | cpp/src/IceGrid/NodeI.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp index 5e3fdacf906..97c4c077b7e 100644 --- a/cpp/src/IceGrid/NodeI.cpp +++ b/cpp/src/IceGrid/NodeI.cpp @@ -299,7 +299,8 @@ NodeI::NodeI(const Ice::ObjectAdapterPtr& adapter, const TraceLevelsPtr& traceLevels, const NodePrx& proxy, const string& name, - const UserAccountMapperPrx& mapper) : + const UserAccountMapperPrx& mapper, + const string& instanceName) : _communicator(adapter->getCommunicator()), _adapter(adapter), _sessions(sessions), @@ -311,6 +312,7 @@ NodeI::NodeI(const Ice::ObjectAdapterPtr& adapter, _redirectErrToOut(false), _allowEndpointsOverride(false), _waitTime(0), + _instanceName(instanceName), _userAccountMapper(mapper), _platform("IceGrid.Node", _communicator, _traceLevels), _fileCache(new FileCache(_communicator)), @@ -322,7 +324,6 @@ NodeI::NodeI(const Ice::ObjectAdapterPtr& adapter, const_cast<string&>(_dataDir) = _platform.getDataDir(); const_cast<string&>(_serversDir) = _dataDir + "/servers"; const_cast<string&>(_tmpDir) = _dataDir + "/tmp"; - const_cast<string&>(_instanceName) = _communicator->getDefaultLocator()->ice_getIdentity().category; const_cast<Ice::Int&>(_waitTime) = props->getPropertyAsIntWithDefault("IceGrid.Node.WaitTime", 60); const_cast<string&>(_outputDir) = props->getProperty("IceGrid.Node.Output"); const_cast<bool&>(_redirectErrToOut) = props->getPropertyAsInt("IceGrid.Node.RedirectErrToOut") > 0; @@ -903,6 +904,12 @@ NodeI::getPropertiesOverride() const return _propertiesOverride; } +const string& +NodeI::getInstanceName() const +{ + return _instanceName; +} + string NodeI::getOutputDir() const { |