Clean up end-of-dump protocol for new cluster members.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@699513 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 5 deletions

diff --git a/cpp/src/qpid/cluster/ClusterMap.cpp b/cpp/src/qpid/cluster/ClusterMap.cpp
index c721749aba..b5b71cd397 100644
--- a/cpp/src/qpid/cluster/ClusterMap.cpp
+++ b/cpp/src/qpid/cluster/ClusterMap.cpp
@@ -45,7 +45,7 @@ bool ClusterMap::left(const cpg_address* addrs, size_t nLeft) {
         changed = members.erase(*a) || changed;
     if (dumper && !isMember(dumper))
         dumper = MemberId();
-    QPID_LOG_IF(debug, changed, *this);
+    QPID_LOG_IF(debug, changed, "Members left. " << *this);
     return changed;
 }
 
@@ -66,7 +66,7 @@ bool ClusterMap::update(const framing::FieldTable& ftMembers, uint64_t dumper_)
         Url url(i->second->get<std::string>());
         changed = members.insert(Members::value_type(id, url)).second || changed;
     }
-    QPID_LOG_IF(debug, changed, *this);
+    QPID_LOG_IF(debug, changed, "Update: " << *this);
     return changed;
 }
 
@@ -94,12 +94,11 @@ bool ClusterMap::ready(const MemberId& id, const Url& url) {
     bool changed = members.insert(Members::value_type(id,url)).second;
     if (id == dumper) {
         dumper = MemberId();
-        QPID_LOG(info, id << " finished dump.");
+        QPID_LOG(info, id << " finished dump. " << *this);
     }
     else {
-        QPID_LOG(info, id << " joined cluster, url=" << url);
+        QPID_LOG(info, id << " joined, url=" << url << ". " << *this);
     }
-    QPID_LOG_IF(debug, changed, *this);
     return changed;
 }