From 7bc808c71f28e7a58aeedbd6dcc450f1265d660c Mon Sep 17 00:00:00 2001 From: Ted Ross Date: Fri, 21 Nov 2008 20:17:22 +0000 Subject: Fixed several problems related to qmf update timestamps: - Timestamps were set at update send time regardless of whether the object's contents were actually changed. Now timestamps are set at the time of the change. - Agent heartbeat messages are now being sent after periodic updates, not before. Cleaned up the Agent object in qmf.console. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@719699 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/agent/ManagementAgentImpl.cpp | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) (limited to 'cpp/src/qpid/agent') diff --git a/cpp/src/qpid/agent/ManagementAgentImpl.cpp b/cpp/src/qpid/agent/ManagementAgentImpl.cpp index dc9122664d..1f7d2569fb 100644 --- a/cpp/src/qpid/agent/ManagementAgentImpl.cpp +++ b/cpp/src/qpid/agent/ManagementAgentImpl.cpp @@ -687,18 +687,6 @@ void ManagementAgentImpl::periodicProcessing() if (!connected) return; - { - Buffer msgBuffer(msgChars, BUFSIZE); - encodeHeader(msgBuffer, 'h'); - msgBuffer.putLongLong(uint64_t(Duration(now()))); - stringstream key; - key << "console.heartbeat." << assignedBrokerBank << "." << assignedAgentBank; - - contentSize = BUFSIZE - msgBuffer.available(); - msgBuffer.reset(); - connThreadBody.sendBuffer(msgBuffer, contentSize, "qpid.management", key.str()); - } - moveNewObjectsLH(); if (debugLevel >= DEBUG_PUBLISH) { @@ -715,9 +703,6 @@ void ManagementAgentImpl::periodicProcessing() } } - if (managementObjects.empty()) - return; - // // Clear the been-here flag on all objects in the map. // @@ -792,6 +777,18 @@ void ManagementAgentImpl::periodicProcessing() } deleteList.clear(); + + { + Buffer msgBuffer(msgChars, BUFSIZE); + encodeHeader(msgBuffer, 'h'); + msgBuffer.putLongLong(uint64_t(Duration(now()))); + stringstream key; + key << "console.heartbeat." << assignedBrokerBank << "." << assignedAgentBank; + + contentSize = BUFSIZE - msgBuffer.available(); + msgBuffer.reset(); + connThreadBody.sendBuffer(msgBuffer, contentSize, "qpid.management", key.str()); + } } void ManagementAgentImpl::ConnectionThread::run() -- cgit v1.2.1