From 1d63a898503d20e3221be43fc222f0091971a0ce Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Wed, 30 May 2007 16:13:58 +0000 Subject: Logging infrastructure: See qpidd --long-help for details. * src/qpid/log/*: Logging infrastructure, QPID_LOG macro. * src/*: changed output to cout/cerr to logging. * src/qpidd.cpp: logging options. * src/tests/Makefile.am: fixed issues with valgrind * src/tests/kill|start_broker: use broker daemon options. * src/tests/run_test: run tests in valgrind. Disabled till leaks in client_test are fixed. * src/test/unit/logging.cpp: Logging unit test using boost test framework. Eventually we should move all unit tests to boost & drop CppUnit. * src/test/unit/test_tools.h: useful extensions to boost framework: Regular expression check, ostream << for vectors. git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@542855 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/client/Connector.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/client/Connector.cpp') diff --git a/cpp/src/qpid/client/Connector.cpp b/cpp/src/qpid/client/Connector.cpp index 3447467fda..18cb0e064b 100644 --- a/cpp/src/qpid/client/Connector.cpp +++ b/cpp/src/qpid/client/Connector.cpp @@ -19,6 +19,7 @@ * */ #include +#include "qpid/log/Statement.h" #include "qpid/QpidError.h" #include "qpid/sys/Time.h" #include "Connector.h" @@ -82,7 +83,7 @@ void Connector::send(AMQFrame* f){ std::auto_ptr frame(f); AMQBody::shared_ptr body = frame->getBody(); writeBlock(frame.get()); - if(debug) std::cout << "SENT: " << *frame << std::endl; + QPID_LOG(trace, "SENT: " << *frame); } void Connector::writeBlock(AMQDataBlock* data){ @@ -182,7 +183,7 @@ void Connector::run(){ AMQFrame frame(version); while(frame.decode(inbuf)){ - if(debug) std::cout << "RECV: " << frame << std::endl; + QPID_LOG(trace, "RECV: " << frame); input->received(&frame); } //need to compact buffer to preserve any 'extra' data @@ -190,7 +191,7 @@ void Connector::run(){ } } } catch (const std::exception& e) { - std::cout << e.what() << std::endl; + QPID_LOG(error, e.what()); handleClosed(); } } -- cgit v1.2.1