NO_JIRA: Small mods to certain log trace and debug messages to improve log message consistency

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

7 files changed, 17 insertions, 17 deletions

diff --git a/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp b/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
index bf2e7d5713..22a37b7115 100644
--- a/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
+++ b/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
@@ -48,7 +48,7 @@ size_t  Connection::decode(const char* buffer, size_t size) {
             if(!(pi==version))
                 throw Exception(QPID_MSG("Unsupported version: " << pi
                                          << " supported version " << version));
-            QPID_LOG(trace, "RECV " << identifier << " INIT(" << pi << ")");
+            QPID_LOG(trace, "RECV [" << identifier << "]: INIT(" << pi << ")");
         }
         initialized = true;
     }
@@ -86,7 +86,7 @@ size_t  Connection::encode(const char* buffer, size_t size) {
         framing::ProtocolInitiation pi(getVersion());
         pi.encode(out);
         initialized = true;
-        QPID_LOG(trace, "SENT " << identifier << " INIT(" << pi << ")");
+        QPID_LOG(trace, "SENT [" << identifier << "]: INIT(" << pi << ")");
     }
     size_t frameSize=0;
     size_t encoded=0;
diff --git a/qpid/cpp/src/qpid/client/RdmaConnector.cpp b/qpid/cpp/src/qpid/client/RdmaConnector.cpp
index 664640f5e7..21143a1a75 100644
--- a/qpid/cpp/src/qpid/client/RdmaConnector.cpp
+++ b/qpid/cpp/src/qpid/client/RdmaConnector.cpp
@@ -379,7 +379,7 @@ size_t RdmaConnector::encode(const char* buffer, size_t size)
         Mutex::ScopedLock l(lock);
         while (!frames.empty() && out.available() >= frames.front().encodedSize() ) {
             frames.front().encode(out);
-            QPID_LOG(trace, "SENT " << identifier << ": " << frames.front());
+            QPID_LOG(trace, "SENT [" << identifier << "]: " << frames.front());
             frames.pop_front();
             if (lastEof) --lastEof;
         }
@@ -402,13 +402,13 @@ size_t RdmaConnector::decode(const char* buffer, size_t size)
         framing::ProtocolInitiation protocolInit;
         if (protocolInit.decode(in)) {
             //TODO: check the version is correct
-            QPID_LOG(debug, "RECV " << identifier << " INIT(" << protocolInit << ")");
+            QPID_LOG(debug, "RECV [" << identifier << "]: INIT(" << protocolInit << ")");
         }
         initiated = true;
     }
     AMQFrame frame;
     while(frame.decode(in)){
-        QPID_LOG(trace, "RECV " << identifier << ": " << frame);
+        QPID_LOG(trace, "RECV [" << identifier << "]: " << frame);
         input->received(frame);
     }
     return size - in.available();
diff --git a/qpid/cpp/src/qpid/client/SslConnector.cpp b/qpid/cpp/src/qpid/client/SslConnector.cpp
index 26c2335eda..6b6bf884ec 100644
--- a/qpid/cpp/src/qpid/client/SslConnector.cpp
+++ b/qpid/cpp/src/qpid/client/SslConnector.cpp
@@ -281,7 +281,7 @@ void SslConnector::Writer::handle(framing::AMQFrame& frame) {
         lastEof = frames.size();
         aio->notifyPendingWrite();
     }
-    QPID_LOG(trace, "SENT " << identifier << ": " << frame);
+    QPID_LOG(trace, "SENT [" << identifier << "]: " << frame);
 }
 
 void SslConnector::Writer::writeOne() {
@@ -328,13 +328,13 @@ void SslConnector::readbuff(SslIO& aio, SslIO::BufferBase* buff) {
         framing::ProtocolInitiation protocolInit;
         if (protocolInit.decode(in)) {
             //TODO: check the version is correct
-            QPID_LOG(debug, "RECV " << identifier << " INIT(" << protocolInit << ")");
+            QPID_LOG(debug, "RECV [" << identifier << "]: INIT(" << protocolInit << ")");
         }
         initiated = true;
     }
     AMQFrame frame;
     while(frame.decode(in)){
-        QPID_LOG(trace, "RECV " << identifier << ": " << frame);
+        QPID_LOG(trace, "RECV [" << identifier << "]: " << frame);
         input->received(frame);
     }
     // TODO: unreading needs to go away, and when we can cope
diff --git a/qpid/cpp/src/qpid/client/TCPConnector.cpp b/qpid/cpp/src/qpid/client/TCPConnector.cpp
index 0070b24ec0..4660a41c07 100644
--- a/qpid/cpp/src/qpid/client/TCPConnector.cpp
+++ b/qpid/cpp/src/qpid/client/TCPConnector.cpp
@@ -254,7 +254,7 @@ size_t TCPConnector::encode(const char* buffer, size_t size)
         Mutex::ScopedLock l(lock);
         while (!frames.empty() && out.available() >= frames.front().encodedSize() ) {
             frames.front().encode(out);
-            QPID_LOG(trace, "SENT " << identifier << ": " << frames.front());
+            QPID_LOG(trace, "SENT [" << identifier << "]: " << frames.front());
             frames.pop_front();
             if (lastEof) --lastEof;
         }
@@ -289,7 +289,7 @@ size_t TCPConnector::decode(const char* buffer, size_t size)
     if (!initiated) {
         framing::ProtocolInitiation protocolInit;
         if (protocolInit.decode(in)) {
-            QPID_LOG(debug, "RECV " << identifier << " INIT(" << protocolInit << ")");
+            QPID_LOG(debug, "RECV [" << identifier << "]: INIT(" << protocolInit << ")");
             if(!(protocolInit==version)){
                 throw Exception(QPID_MSG("Unsupported version: " << protocolInit
                                          << " supported version " << version));
@@ -299,7 +299,7 @@ size_t TCPConnector::decode(const char* buffer, size_t size)
     }
     AMQFrame frame;
     while(frame.decode(in)){
-        QPID_LOG(trace, "RECV " << identifier << ": " << frame);
+        QPID_LOG(trace, "RECV [" << identifier << "]: " << frame);
         input->received(frame);
     }
     return size - in.available();
diff --git a/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp b/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
index 30a87d9d44..5233002850 100644
--- a/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
+++ b/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
@@ -68,7 +68,7 @@ void AsynchIOHandler::init(AsynchIO* a, int numBuffs) {
 
 void AsynchIOHandler::write(const framing::ProtocolInitiation& data)
 {
-    QPID_LOG(debug, "SENT [" << identifier << "] INIT(" << data << ")");
+    QPID_LOG(debug, "SENT [" << identifier << "]: INIT(" << data << ")");
     AsynchIO::BufferBase* buff = aio->getQueuedBuffer();
     if (!buff)
         buff = new Buff;
@@ -143,7 +143,7 @@ void AsynchIOHandler::readbuff(AsynchIO& , AsynchIO::BufferBase* buff) {
         framing::ProtocolInitiation protocolInit;
         if (protocolInit.decode(in)) {
             decoded = in.getPosition();
-            QPID_LOG(debug, "RECV [" << identifier << "] INIT(" << protocolInit << ")");
+            QPID_LOG(debug, "RECV [" << identifier << "]: INIT(" << protocolInit << ")");
             try {
                 codec = factory->create(protocolInit.getVersion(), *this, identifier, SecuritySettings());
                 if (!codec) {
diff --git a/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
index 6769e5383c..b491d28d0a 100644
--- a/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
+++ b/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
@@ -114,7 +114,7 @@ void RdmaIOHandler::start(Poller::shared_ptr poller) {
 
 void RdmaIOHandler::write(const framing::ProtocolInitiation& data)
 {
-    QPID_LOG(debug, "Rdma: SENT [" << identifier << "] INIT(" << data << ")");
+    QPID_LOG(debug, "Rdma: SENT [" << identifier << "]: INIT(" << data << ")");
     Rdma::Buffer* buff = aio->getSendBuffer();
     assert(buff);
     framing::Buffer out(buff->bytes(), buff->byteCount());
@@ -229,7 +229,7 @@ void RdmaIOHandler::initProtocolIn(Rdma::Buffer* buff) {
     framing::Buffer in(buff->bytes(), buff->dataCount());
     framing::ProtocolInitiation protocolInit;
     if (protocolInit.decode(in)) {
-        QPID_LOG(debug, "Rdma: RECV [" << identifier << "] INIT(" << protocolInit << ")");
+        QPID_LOG(debug, "Rdma: RECV [" << identifier << "]: INIT(" << protocolInit << ")");
 
         codec = factory->create(protocolInit.getVersion(), *this, identifier, SecuritySettings());
 
diff --git a/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp b/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
index 5516d72065..67bf4ea893 100644
--- a/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
+++ b/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
@@ -69,7 +69,7 @@ void SslHandler::init(SslIO* a, int numBuffs) {
 
 void SslHandler::write(const framing::ProtocolInitiation& data)
 {
-    QPID_LOG(debug, "SENT [" << identifier << "] INIT(" << data << ")");
+    QPID_LOG(debug, "SENT [" << identifier << "]: INIT(" << data << ")");
     SslIO::BufferBase* buff = aio->getQueuedBuffer();
     if (!buff)
         buff = new Buff;
@@ -110,7 +110,7 @@ void SslHandler::readbuff(SslIO& , SslIO::BufferBase* buff) {
         framing::ProtocolInitiation protocolInit;
         if (protocolInit.decode(in)) {
             decoded = in.getPosition();
-            QPID_LOG(debug, "RECV [" << identifier << "] INIT(" << protocolInit << ")");
+            QPID_LOG(debug, "RECV [" << identifier << "]: INIT(" << protocolInit << ")");
             try {
                 codec = factory->create(protocolInit.getVersion(), *this, identifier, getSecuritySettings(aio));
                 if (!codec) {