Service was not handling properties properly

4 files changed, 21 insertions, 18 deletions

diff --git a/cpp/src/IceStorm/Server.cpp b/cpp/src/IceStorm/Server.cpp
index d79cde2d5e7..b1f1cf9b077 100644
--- a/cpp/src/IceStorm/Server.cpp
+++ b/cpp/src/IceStorm/Server.cpp
@@ -93,7 +93,8 @@ IceStorm::Server::runFreeze(int argc, char* argv[], const Freeze::DBEnvironmentP
 
     Freeze::DBPtr dbTopicManager = dbEnv->openDB("topicmanager", true);
 
-    TraceLevelsPtr traceLevels = new TraceLevels(communicator()->getProperties(), communicator()->getLogger());
+    TraceLevelsPtr traceLevels = new TraceLevels("IceStorm", communicator()->getProperties(),
+    						 communicator()->getLogger());
     ObjectAdapterPtr adapter = communicator()->createObjectAdapterFromProperty("TopicManager",
 									       "IceStorm.TopicManager.Endpoints");
     TopicManagerIPtr manager = new TopicManagerI(communicator(), adapter, traceLevels, dbEnv, dbTopicManager);
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index b97a01730a3..3c40543cd16 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -15,6 +15,7 @@
 using namespace std;
 using namespace Ice;
 using namespace IceStorm;
+using namespace Freeze;
 
 namespace IceStorm
 {
@@ -26,11 +27,11 @@ public:
     Service();
     virtual ~Service();
 
-    virtual void start(const ::std::string&,
-		       const ::Ice::CommunicatorPtr&,
-		       const ::Ice::PropertiesPtr&,
-		       const ::Ice::StringSeq&,
-		       const ::Freeze::DBEnvironmentPtr&);
+    virtual void start(const string&,
+                      const CommunicatorPtr&,
+                      const PropertiesPtr&,
+                      const StringSeq&,
+                      const DBEnvironmentPtr&);
 
     virtual void stop();
 
@@ -49,9 +50,9 @@ extern "C"
 // Factory function
 //
 ::IceBox::FreezeService*
-create(Ice::CommunicatorPtr communicator)
+create(CommunicatorPtr communicator)
 {
-    return new ::IceStorm::Service;
+    return new Service;
 }
 
 }
@@ -66,15 +67,16 @@ IceStorm::Service::~Service()
 
 void
 IceStorm::Service::start(const string& name,
-			 const ::Ice::CommunicatorPtr& communicator,
-			 const ::Ice::PropertiesPtr& properties,
-			 const ::Ice::StringSeq& args,
-			 const ::Freeze::DBEnvironmentPtr& dbEnv)
+			 const CommunicatorPtr& communicator,
+			 const PropertiesPtr& properties,
+			 const StringSeq& args,
+			 const DBEnvironmentPtr& dbEnv)
 {
-    Freeze::DBPtr dbTopicManager = dbEnv->openDB("topicmanager", true);
+    DBPtr dbTopicManager = dbEnv->openDB("topicmanager", true);
 
-    TraceLevelsPtr traceLevels = new TraceLevels(communicator->getProperties(), communicator->getLogger());
-    _adapter = communicator->createObjectAdapterFromProperty("TopicManager", "IceStorm.TopicManager.Endpoints");
+    TraceLevelsPtr traceLevels = new TraceLevels(name, properties, communicator->getLogger());
+    string endpoints = properties->getProperty(name + ".TopicManager.Endpoints");
+    _adapter = communicator->createObjectAdapterWithEndpoints("TopicManager", endpoints);
     _manager = new TopicManagerI(communicator, _adapter, traceLevels, dbEnv, dbTopicManager);
     _adapter->add(_manager, stringToIdentity("TopicManager"));
 
diff --git a/cpp/src/IceStorm/TraceLevels.cpp b/cpp/src/IceStorm/TraceLevels.cpp
index 3bdf7eee90d..44a0bd7177f 100644
--- a/cpp/src/IceStorm/TraceLevels.cpp
+++ b/cpp/src/IceStorm/TraceLevels.cpp
@@ -14,7 +14,7 @@
 using namespace std;
 using namespace IceStorm;
 
-TraceLevels::TraceLevels(const Ice::PropertiesPtr& properties, const Ice::LoggerPtr& theLogger) :
+TraceLevels::TraceLevels(const string name, const Ice::PropertiesPtr& properties, const Ice::LoggerPtr& theLogger) :
     topicMgr(0),
     topicMgrCat("TopicManager"),
     topic(0),
@@ -25,7 +25,7 @@ TraceLevels::TraceLevels(const Ice::PropertiesPtr& properties, const Ice::Logger
     subscriberCat("Subscriber"),
     logger(theLogger)
 {
-    const string keyBase = "IceStorm.Trace.";
+    const string keyBase = name + ".Trace.";
     const_cast<int&>(topicMgr) = properties->getPropertyAsInt(keyBase + topicMgrCat);
     const_cast<int&>(topic) = properties->getPropertyAsInt(keyBase + topicCat);
     const_cast<int&>(flush) = properties->getPropertyAsInt(keyBase + flushCat);
diff --git a/cpp/src/IceStorm/TraceLevels.h b/cpp/src/IceStorm/TraceLevels.h
index 11ef76df3d2..55bee4ff89e 100644
--- a/cpp/src/IceStorm/TraceLevels.h
+++ b/cpp/src/IceStorm/TraceLevels.h
@@ -22,7 +22,7 @@ class TraceLevels : public ::IceUtil::Shared
 {
 public:
 
-    TraceLevels(const ::Ice::PropertiesPtr&, const Ice::LoggerPtr&);
+    TraceLevels(const ::std::string name, const ::Ice::PropertiesPtr&, const Ice::LoggerPtr&);
     virtual ~TraceLevels();
 
     const int topicMgr;