commit c00dff90f24713fc56cdfc77fc24e4bd57435654
author Alan Conway <aconway@apache.org> Thu Aug 21 20:55:51 2014 +0000
committer Alan Conway <aconway@apache.org> Thu Aug 21 20:55:51 2014 +0000
tree 9858f210799ef963f4d90418708f52631ac5029d
parent cb53d050ee9936700dd4bbc3cc3e3b15f23fcce0

QPID-6020: HA logging improvements - log prefix with status and ID.

Fix log prefix for RemoteBackup and PrimaryTxObserver objects.
Use short UUIDs for showing UUID sets in logs.

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

qpid/cpp/src/qpid/ha/Primary.cpp

diff --git a/qpid/cpp/src/qpid/ha/Primary.cpp b/qpid/cpp/src/qpid/ha/Primary.cpp
index 3790d14..0e87346 100644
--- a/qpid/cpp/src/qpid/ha/Primary.cpp
+++ b/qpid/cpp/src/qpid/ha/Primary.cpp
@@ -158,7 +158,7 @@
         // the QueueGuards are created.
         QPID_LOG(notice, logPrefix << "Recovering backups: " << expect);
         for (BrokerInfo::Set::const_iterator i = expect.begin(); i != expect.end(); ++i) {
-            boost::shared_ptr<RemoteBackup> backup(new RemoteBackup(*i, 0, logPrefix));
+            boost::shared_ptr<RemoteBackup> backup(new RemoteBackup(*i, 0, haBroker.logPrefix));
             backups[i->getSystemId()] = backup;
             if (!backup->isReady()) expectedBackups.insert(backup);
             setCatchupQueues(backup, true); // Create guards
@@ -361,7 +361,7 @@
 shared_ptr<RemoteBackup> Primary::backupConnect(
     const BrokerInfo& info, broker::Connection& connection, Mutex::ScopedLock&)
 {
-    shared_ptr<RemoteBackup> backup(new RemoteBackup(info, &connection, logPrefix));
+    shared_ptr<RemoteBackup> backup(new RemoteBackup(info, &connection, haBroker.logPrefix));
     queueLimits.addBackup(backup);
     backups[info.getSystemId()] = backup;
     return backup;

qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp

diff --git a/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp b/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
index bbfcbba..3c6318f 100644
--- a/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
+++ b/qpid/cpp/src/qpid/ha/PrimaryTxObserver.cpp
@@ -136,7 +136,6 @@
     txQueue = result.first;
     txQueue->markInUse(); // Prevent auto-delete till we are done.
     txQueue->deliver(TxBackupsEvent(backups).message());
-
 }
 
 

qpid/cpp/src/qpid/ha/RemoteBackup.cpp

diff --git a/qpid/cpp/src/qpid/ha/RemoteBackup.cpp b/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
index c263d37..d511b5b 100644
--- a/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
+++ b/qpid/cpp/src/qpid/ha/RemoteBackup.cpp
@@ -70,7 +70,7 @@
         QPID_LOG(debug, logPrefix << "Catch-up queue"
                  << (createGuard ? " and guard" : "") << ": " << q->getName());
         catchupQueues.insert(q);
-        if (createGuard) guards[q].reset(new QueueGuard(*q, brokerInfo, logPrefix));
+        if (createGuard) guards[q].reset(new QueueGuard(*q, brokerInfo, logPrefix.prePrefix));
     }
 }
 
@@ -91,7 +91,7 @@
 // Called via BrokerObserver::queueCreate and from catchupQueue
 void RemoteBackup::queueCreate(const QueuePtr& q) {
     if (replicationTest.getLevel(*q) == ALL)
-        guards[q].reset(new QueueGuard(*q, brokerInfo, logPrefix));
+        guards[q].reset(new QueueGuard(*q, brokerInfo, logPrefix.prePrefix));
 }
 
 // Called via BrokerObserver

qpid/cpp/src/qpid/ha/types.cpp

diff --git a/qpid/cpp/src/qpid/ha/types.cpp b/qpid/cpp/src/qpid/ha/types.cpp
index 00058a8..60cc0f2 100644
--- a/qpid/cpp/src/qpid/ha/types.cpp
+++ b/qpid/cpp/src/qpid/ha/types.cpp
@@ -90,7 +90,8 @@
 ostream& operator<<(ostream& o, const UuidSet& ids) {
     ostream_iterator<qpid::types::Uuid> out(o, " ");
     o << "{ ";
-    copy(ids.begin(), ids.end(), out);
+    for (UuidSet::const_iterator i = ids.begin(); i != ids.end(); ++i)
+        o << shortStr(*i) << " ";
     o << "}";
     return o;
 }