QPID-3603: Better log messages for HA code.

Identify host name of backup in ReplicatingSubscription logs.

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

1 files changed, 9 insertions, 5 deletions

diff --git a/cpp/src/qpid/ha/LogPrefix.cpp b/cpp/src/qpid/ha/LogPrefix.cpp
index 828e226677..d80fe23458 100644
--- a/cpp/src/qpid/ha/LogPrefix.cpp
+++ b/cpp/src/qpid/ha/LogPrefix.cpp
@@ -25,22 +25,26 @@
 namespace qpid {
 namespace ha {
 
-LogPrefix::LogPrefix(HaBroker& hb, const std::string& queue) : haBroker(&hb), status(0) {
-    if (queue.size()) tail = " queue " + queue;
+LogPrefix::LogPrefix(HaBroker& hb, const std::string& msg) : haBroker(&hb), status(0) {
+    if (msg.size()) setMessage(msg);
 }
 
-LogPrefix::LogPrefix(LogPrefix& lp, const std::string& queue)
+LogPrefix::LogPrefix(LogPrefix& lp, const std::string& msg)
   : haBroker(lp.haBroker), status(0)
 {
-    if (queue.size()) tail = " queue " + queue;
+    if (msg.size()) setMessage(msg);
 }
 
 LogPrefix::LogPrefix(BrokerStatus& s) : haBroker(0), status(&s) {}
 
+void LogPrefix::setMessage(const std::string& msg) {
+    tail = " "+msg+":";
+}
+
 std::ostream& operator<<(std::ostream& o, const LogPrefix& l) {
     return o << "HA("
              << printable(l.status ? *l.status : l.haBroker->getStatus())
-             << ")" << l.tail << ": ";
+             << ")" << l.tail << " ";
 }
 
 }} // namespace qpid::ha