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/broker/NullMessageStore.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'cpp/src/qpid/broker/NullMessageStore.cpp') diff --git a/cpp/src/qpid/broker/NullMessageStore.cpp b/cpp/src/qpid/broker/NullMessageStore.cpp index 686c2238ff..49feb163bf 100644 --- a/cpp/src/qpid/broker/NullMessageStore.cpp +++ b/cpp/src/qpid/broker/NullMessageStore.cpp @@ -20,8 +20,8 @@ */ #include "NullMessageStore.h" - #include "RecoveryManager.h" +#include "qpid/log/Statement.h" #include @@ -31,60 +31,60 @@ NullMessageStore::NullMessageStore(bool _warn) : warn(_warn){} void NullMessageStore::create(const PersistableQueue& queue) { - if (warn) std::cout << "WARNING: Can't create durable queue '" << queue.getName() << "'. Persistence not enabled." << std::endl; + QPID_LOG(warning, "Can't create durable queue '" << queue.getName() << "'. Persistence not enabled."); } void NullMessageStore::destroy(const PersistableQueue& queue) { - if (warn) std::cout << "WARNING: Can't destroy durable queue '" << queue.getName() << "'. Persistence not enabled." << std::endl; + QPID_LOG(warning, "Can't destroy durable queue '" << queue.getName() << "'. Persistence not enabled."); } void NullMessageStore::create(const PersistableExchange& exchange) { - if (warn) std::cout << "WARNING: Can't create durable exchange '" << exchange.getName() << "'. Persistence not enabled." << std::endl; + QPID_LOG(warning, "Can't create durable exchange '" + << exchange.getName() << "'. Persistence not enabled."); } -void NullMessageStore::destroy(const PersistableExchange& exchange) -{ - if (warn) std::cout << "WARNING: Can't destroy durable exchange '" << exchange.getName() << "'. Persistence not enabled." << std::endl; -} +void NullMessageStore::destroy(const PersistableExchange& ) +{} + void NullMessageStore::bind(const PersistableExchange&, const PersistableQueue&, const std::string&, const framing::FieldTable&){} void NullMessageStore::unbind(const PersistableExchange&, const PersistableQueue&, const std::string&, const framing::FieldTable&){} void NullMessageStore::recover(RecoveryManager&) { - if (warn) std::cout << "WARNING: Persistence not enabled, no recovery of queues or messages." << std::endl; + QPID_LOG(warning, "Persistence not enabled, no recovery of queues or messages."); } void NullMessageStore::stage(PersistableMessage&) { - if (warn) std::cout << "WARNING: Can't stage message. Persistence not enabled." << std::endl; + QPID_LOG(warning, "Can't stage message. Persistence not enabled."); } void NullMessageStore::destroy(PersistableMessage&) { - if (warn) std::cout << "WARNING: No need to destroy staged message. Persistence not enabled." << std::endl; + QPID_LOG(warning, "No need to destroy staged message. Persistence not enabled."); } void NullMessageStore::appendContent(PersistableMessage&, const string&) { - if (warn) std::cout << "WARNING: Can't append content. Persistence not enabled." << std::endl; + QPID_LOG(warning, "Can't load content. Persistence not enabled."); } void NullMessageStore::loadContent(PersistableMessage&, string&, uint64_t, uint32_t) { - if (warn) std::cout << "WARNING: Can't load content. Persistence not enabled." << std::endl; + QPID_LOG(warning, "WARNING: Can't load content. Persistence not enabled."); } void NullMessageStore::enqueue(TransactionContext*, PersistableMessage&, const PersistableQueue& queue) { - if (warn) std::cout << "WARNING: Can't enqueue message onto '" << queue.getName() << "'. Persistence not enabled." << std::endl; + QPID_LOG(warning, "Can't enqueue message onto '" << queue.getName() << "'. Persistence not enabled."); } void NullMessageStore::dequeue(TransactionContext*, PersistableMessage&, const PersistableQueue& queue) { - if (warn) std::cout << "WARNING: Can't dequeue message from '" << queue.getName() << "'. Persistence not enabled." << std::endl; + QPID_LOG(warning, "Can't dequeue message from '" << queue.getName() << "'. Persistence not enabled."); } std::auto_ptr NullMessageStore::begin() -- cgit v1.2.1