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/ClientConnection.cpp | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) (limited to 'cpp/src/qpid/client/ClientConnection.cpp') diff --git a/cpp/src/qpid/client/ClientConnection.cpp b/cpp/src/qpid/client/ClientConnection.cpp index 177c9c4b73..d6d03680c1 100644 --- a/cpp/src/qpid/client/ClientConnection.cpp +++ b/cpp/src/qpid/client/ClientConnection.cpp @@ -25,6 +25,7 @@ #include "Connection.h" #include "ClientChannel.h" #include "ClientMessage.h" +#include "qpid/log/Statement.h" #include "qpid/QpidError.h" #include #include @@ -78,7 +79,7 @@ void Connection::shutdown() { //this indicates that the socket to the server has closed we do //not want to send a close request (or any other requests) if(markClosed()) { - std::cout << "Connection to peer closed!" << std::endl; + QPID_LOG(info, "Connection to peer closed!"); closeChannels(); } } @@ -88,11 +89,13 @@ void Connection::close( ) { if(markClosed()) { - // TODO aconway 2007-01-29: Exception handling - could end up - // partly closed with threads left unjoined. - channel0.sendAndReceive( - make_shared_ptr(new ConnectionCloseBody( - getVersion(), code, msg, classId, methodId))); + try { + channel0.sendAndReceive( + make_shared_ptr(new ConnectionCloseBody( + getVersion(), code, msg, classId, methodId))); + } catch (const std::exception& e) { + QPID_LOG(error, "Exception closing channel: " << e.what()); + } closeChannels(); connector->close(); } -- cgit v1.2.1