From 0742abc5e6831675aba58949d763fb4f819cde69 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Wed, 16 Jul 2008 20:25:12 +0000 Subject: QPID-1170 - Provide a better factory for creation and deletion of the management agent git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@677408 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/broker/Broker.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'cpp/src/qpid/broker/Broker.cpp') diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp index 47d9dad537..bffca94f95 100644 --- a/cpp/src/qpid/broker/Broker.cpp +++ b/cpp/src/qpid/broker/Broker.cpp @@ -122,6 +122,7 @@ const std::string qpid_management("qpid.management"); Broker::Broker(const Broker::Options& conf) : poller(new Poller), config(conf), + managementAgentSingleton(!config.enableMgmt), store(0), dataDir(conf.noDataDir ? std::string () : conf.dataDir), links(this), @@ -134,10 +135,10 @@ Broker::Broker(const Broker::Options& conf) : { if(conf.enableMgmt){ QPID_LOG(info, "Management enabled"); - ManagementBroker::enableManagement (dataDir.isEnabled () ? dataDir.getPath () : string (), - conf.mgmtPubInterval, this, conf.workerThreads + 3); - managementAgent = management::ManagementAgent::getAgent (); - ((ManagementBroker*) managementAgent)->setInterval (conf.mgmtPubInterval); + managementAgent = managementAgentSingleton.getInstance(); + ((ManagementBroker*) managementAgent)->configure + (dataDir.isEnabled () ? dataDir.getPath () : string (), + conf.mgmtPubInterval, this, conf.workerThreads + 3); qpid::management::PackageQpid packageInitializer (managementAgent); System* system = new System (dataDir.isEnabled () ? dataDir.getPath () : string ()); @@ -294,7 +295,6 @@ Broker::~Broker() { sasl_done(); #endif } - ManagementBroker::shutdown(); QPID_LOG(notice, "Shut down"); } -- cgit v1.2.1