You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by kp...@apache.org on 2011/10/31 13:44:19 UTC
svn commit: r1195433 - in /qpid/trunk/qpid/cpp/src/qpid:
amqp_0_10/Connection.cpp client/RdmaConnector.cpp client/SslConnector.cpp
client/TCPConnector.cpp sys/AsynchIOHandler.cpp sys/RdmaIOPlugin.cpp
sys/ssl/SslHandler.cpp
Author: kpvdr
Date: Mon Oct 31 12:44:19 2011
New Revision: 1195433
URL: http://svn.apache.org/viewvc?rev=1195433&view=rev
Log:
NO_JIRA: Small mods to certain log trace and debug messages to improve log message consistency
Modified:
qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp
qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp
qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp?rev=1195433&r1=1195432&r2=1195433&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/Connection.cpp Mon Oct 31 12:44:19 2011
@@ -48,7 +48,7 @@ size_t Connection::decode(const char* b
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* b
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;
Modified: qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp?rev=1195433&r1=1195432&r2=1195433&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/RdmaConnector.cpp Mon Oct 31 12:44:19 2011
@@ -379,7 +379,7 @@ size_t RdmaConnector::encode(const char*
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*
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();
Modified: qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp?rev=1195433&r1=1195432&r2=1195433&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/SslConnector.cpp Mon Oct 31 12:44:19 2011
@@ -281,7 +281,7 @@ void SslConnector::Writer::handle(framin
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,
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
Modified: qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp?rev=1195433&r1=1195432&r2=1195433&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/TCPConnector.cpp Mon Oct 31 12:44:19 2011
@@ -254,7 +254,7 @@ size_t TCPConnector::encode(const char*
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*
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*
}
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();
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp?rev=1195433&r1=1195432&r2=1195433&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.cpp Mon Oct 31 12:44:19 2011
@@ -68,7 +68,7 @@ void AsynchIOHandler::init(AsynchIO* a,
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&
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) {
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp?rev=1195433&r1=1195432&r2=1195433&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/RdmaIOPlugin.cpp Mon Oct 31 12:44:19 2011
@@ -114,7 +114,7 @@ void RdmaIOHandler::start(Poller::shared
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:
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());
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp?rev=1195433&r1=1195432&r2=1195433&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/ssl/SslHandler.cpp Mon Oct 31 12:44:19 2011
@@ -69,7 +69,7 @@ void SslHandler::init(SslIO* a, int numB
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
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) {
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org