From 5afbb19b7ceb60a694207b4c2da9f1378d9ec856 Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Wed, 4 Jun 2008 22:13:40 +0000 Subject: Management cleanup - Synchronized with the spec on the Wiki git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@663386 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/management/ManagementBroker.cpp | 12 ++++++------ cpp/src/qpid/management/ManagementObject.h | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'cpp/src') diff --git a/cpp/src/qpid/management/ManagementBroker.cpp b/cpp/src/qpid/management/ManagementBroker.cpp index 2f30aa4c0b..24d18875b6 100644 --- a/cpp/src/qpid/management/ManagementBroker.cpp +++ b/cpp/src/qpid/management/ManagementBroker.cpp @@ -299,11 +299,11 @@ void ManagementBroker::PeriodicProcessing (void) { Buffer msgBuffer (msgChars, BUFSIZE); EncodeHeader (msgBuffer, 'c'); - object->writeConfig (msgBuffer); + object->writeProperties(msgBuffer); contentSize = BUFSIZE - msgBuffer.available (); msgBuffer.reset (); - routingKey = "mgmt." + uuid.str() + ".config." + object->getClassName (); + routingKey = "mgmt." + uuid.str() + ".prop." + object->getClassName (); SendBuffer (msgBuffer, contentSize, mExchange, routingKey); } @@ -311,11 +311,11 @@ void ManagementBroker::PeriodicProcessing (void) { Buffer msgBuffer (msgChars, BUFSIZE); EncodeHeader (msgBuffer, 'i'); - object->writeInstrumentation (msgBuffer); + object->writeStatistics(msgBuffer); contentSize = BUFSIZE - msgBuffer.available (); msgBuffer.reset (); - routingKey = "mgmt." + uuid.str () + ".inst." + object->getClassName (); + routingKey = "mgmt." + uuid.str () + ".stat." + object->getClassName (); SendBuffer (msgBuffer, contentSize, mExchange, routingKey); } @@ -681,8 +681,8 @@ void ManagementBroker::handleGetQueryLH (Buffer& inBuffer, string replyToKey, ui uint32_t outLen; EncodeHeader (outBuffer, 'g', sequence); - object->writeConfig (outBuffer); - object->writeInstrumentation (outBuffer, true); + object->writeProperties(outBuffer); + object->writeStatistics(outBuffer, true); outLen = MA_BUFFER_SIZE - outBuffer.available (); outBuffer.reset (); SendBuffer (outBuffer, outLen, dExchange, replyToKey); diff --git a/cpp/src/qpid/management/ManagementObject.h b/cpp/src/qpid/management/ManagementObject.h index 1d54d606a4..38f72710de 100644 --- a/cpp/src/qpid/management/ManagementObject.h +++ b/cpp/src/qpid/management/ManagementObject.h @@ -86,13 +86,13 @@ class ManagementObject virtual ~ManagementObject () {} virtual writeSchemaCall_t getWriteSchemaCall (void) = 0; - virtual void writeConfig (qpid::framing::Buffer& buf) = 0; - virtual void writeInstrumentation (qpid::framing::Buffer& buf, - bool skipHeaders = false) = 0; - virtual void doMethod (std::string methodName, - qpid::framing::Buffer& inBuf, - qpid::framing::Buffer& outBuf) = 0; - virtual void setReference(uint64_t objectId); + virtual void writeProperties(qpid::framing::Buffer& buf) = 0; + virtual void writeStatistics(qpid::framing::Buffer& buf, + bool skipHeaders = false) = 0; + virtual void doMethod (std::string methodName, + qpid::framing::Buffer& inBuf, + qpid::framing::Buffer& outBuf) = 0; + virtual void setReference (uint64_t objectId); virtual std::string getClassName (void) = 0; virtual std::string getPackageName (void) = 0; -- cgit v1.2.1