diff options
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/IceStorm/Admin.cpp | 12 | ||||
| -rw-r--r-- | cpp/src/IceStorm/Service.cpp | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/IceStorm/Admin.cpp b/cpp/src/IceStorm/Admin.cpp index 60236265772..c06a44b304b 100644 --- a/cpp/src/IceStorm/Admin.cpp +++ b/cpp/src/IceStorm/Admin.cpp @@ -157,19 +157,19 @@ Client::run(int argc, char* argv[]) return EXIT_FAILURE; } - const char* managerEndpointsProperty = "IceStorm.TopicManager.Endpoints"; - string managerEndpoints = properties->getProperty(managerEndpointsProperty); - if(managerEndpoints.empty()) + const char* managerReferenceProperty = "IceStorm.TopicManager"; + string managerReference = properties->getProperty(managerReferenceProperty); + if(managerReference.empty()) { - cerr << appName() << ": property `" << managerEndpointsProperty << "' is not set" << endl; + cerr << appName() << ": property `" << managerReferenceProperty << "' is not set" << endl; return EXIT_FAILURE; } - ObjectPrx base = communicator()->stringToProxy("TopicManager:" + managerEndpoints); + ObjectPrx base = communicator()->stringToProxy(managerReference); IceStorm::TopicManagerPrx manager = IceStorm::TopicManagerPrx::checkedCast(base); if(!manager) { - cerr << appName() << ": `" << managerEndpoints << "' is not running" << endl; + cerr << appName() << ": `" << managerReference << "' is not running" << endl; return EXIT_FAILURE; } diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp index 3c40543cd16..6edbcb58bf3 100644 --- a/cpp/src/IceStorm/Service.cpp +++ b/cpp/src/IceStorm/Service.cpp @@ -76,9 +76,9 @@ IceStorm::Service::start(const string& name, TraceLevelsPtr traceLevels = new TraceLevels(name, properties, communicator->getLogger()); string endpoints = properties->getProperty(name + ".TopicManager.Endpoints"); - _adapter = communicator->createObjectAdapterWithEndpoints("TopicManager", endpoints); + _adapter = communicator->createObjectAdapterWithEndpoints(name + ".TopicManagerAdapter", endpoints); _manager = new TopicManagerI(communicator, _adapter, traceLevels, dbEnv, dbTopicManager); - _adapter->add(_manager, stringToIdentity("TopicManager")); + _adapter->add(_manager, stringToIdentity(name + ".TopicManager")); _adapter->activate(); } |