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

8 files changed, 30 insertions, 27 deletions

diff --git a/cpp/src/qpid/broker/AutoDelete.cpp b/cpp/src/qpid/broker/AutoDelete.cpp
index 8f1f38b184..45ce12c036 100644
--- a/cpp/src/qpid/broker/AutoDelete.cpp
+++ b/cpp/src/qpid/broker/AutoDelete.cpp
@@ -19,6 +19,7 @@
  *
  */
 #include "AutoDelete.h"
+#include "qpid/log/Statement.h"
 #include "qpid/sys/Time.h"
 
 using namespace qpid::broker;
@@ -51,7 +52,7 @@ void AutoDelete::process(){
         }else if(q->canAutoDelete()){
             std::string name(q->getName());
             registry->destroy(name);
-            std::cout << "INFO: Auto-deleted queue named " << name << std::endl;
+            QPID_LOG(info, "Auto-deleted queue named " << name);
         }else{
             add(q);
             if(!seen) seen = q;
diff --git a/cpp/src/qpid/broker/BrokerMessage.cpp b/cpp/src/qpid/broker/BrokerMessage.cpp
index ce21a2cca4..83b6f2bf18 100644
--- a/cpp/src/qpid/broker/BrokerMessage.cpp
+++ b/cpp/src/qpid/broker/BrokerMessage.cpp
@@ -26,6 +26,7 @@
 #include "InMemoryContent.h"
 #include "LazyLoadedContent.h"
 #include "MessageStore.h"
+#include "qpid/log/Statement.h"
 #include "qpid/framing/BasicDeliverBody.h"
 #include "qpid/framing/BasicGetOkBody.h"
 #include "qpid/framing/AMQContentBody.h"
@@ -76,8 +77,6 @@ void BasicMessage::deliver(ChannelAdapter& channel,
                            const string& consumerTag, uint64_t deliveryTag, 
                            uint32_t framesize)
 {
-    // CCT -- TODO - Update code generator to take pointer/ not
-    // instance to avoid extra contruction
     channel.send(
     	new BasicDeliverBody(
             channel.getVersion(), consumerTag, deliveryTag,
@@ -91,8 +90,6 @@ void BasicMessage::sendGetOk(const MethodContext& context,
                              uint64_t deliveryTag, 
                              uint32_t framesize)
 {
-    // CCT -- TODO - Update code generator to take pointer/ not
-    // instance to avoid extra contruction
     context.channel->send(
         new BasicGetOkBody(
             context.channel->getVersion(),
@@ -155,7 +152,7 @@ void BasicMessage::decodeContent(Buffer& buffer, uint32_t chunkSize)
 {    
     uint64_t expected = expectedContentSize();
     if (expected != buffer.available()) {
-        std::cout << "WARN: Expected " << expectedContentSize() << " bytes, got " << buffer.available() << std::endl;
+        QPID_LOG(error, "Expected " << expectedContentSize() << " bytes, got " << buffer.available());
         throw Exception("Cannot decode content, buffer not large enough.");
     }
 
diff --git a/cpp/src/qpid/broker/BrokerQueue.cpp b/cpp/src/qpid/broker/BrokerQueue.cpp
index 0fbff0f8fd..ee1a913a96 100644
--- a/cpp/src/qpid/broker/BrokerQueue.cpp
+++ b/cpp/src/qpid/broker/BrokerQueue.cpp
@@ -21,6 +21,7 @@
 
 #include <boost/format.hpp>
 
+#include "qpid/log/Statement.h"
 #include "BrokerQueue.h"
 #include "MessageStore.h"
 #include "qpid/sys/Monitor.h"
@@ -78,7 +79,7 @@ bool Queue::dispatch(Message::shared_ptr& msg){
         return false;
     }else if(exclusive){
         if(!exclusive->deliver(msg)){
-            std::cout << "WARNING: Dropping undeliverable message from queue with exclusive consumer." << std::endl;
+            QPID_LOG(warning, "Dropping undeliverable message from queue with exclusive consumer.");
         }
         return true;
     }else{
diff --git a/cpp/src/qpid/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp
index 88015ce310..15031ff243 100644
--- a/cpp/src/qpid/broker/Connection.cpp
+++ b/cpp/src/qpid/broker/Connection.cpp
@@ -18,6 +18,7 @@
  * under the License.
  *
  */
+#include "qpid/log/Statement.h"
 #include <iostream>
 #include <assert.h>
 
@@ -99,8 +100,8 @@ void Connection::closed(){
             exclusiveQueues.erase(exclusiveQueues.begin());
         }
     } catch(std::exception& e) {
-        std::cout << "Caught unhandled exception while closing session: " <<
-            e.what() << std::endl;
+        QPID_LOG(error, " Unhandled exception while closing session: " <<
+                 e.what());
         assert(0);
     }
 }
diff --git a/cpp/src/qpid/broker/DirectExchange.cpp b/cpp/src/qpid/broker/DirectExchange.cpp
index ec77efa0f3..01817144d6 100644
--- a/cpp/src/qpid/broker/DirectExchange.cpp
+++ b/cpp/src/qpid/broker/DirectExchange.cpp
@@ -18,6 +18,7 @@
  * under the License.
  *
  */
+#include "qpid/log/Statement.h"
 #include "DirectExchange.h"
 #include <iostream>
 
@@ -64,7 +65,7 @@ void DirectExchange::route(Deliverable& msg, const string& routingKey, const Fie
         msg.deliverTo(*i);
     }
     if(!count){
-        std::cout << "WARNING: DirectExchange " << getName() << " could not route message with key " << routingKey << std::endl;
+        QPID_LOG(warning, "DirectExchange " << getName() << " could not route message with key " << routingKey);
     }
 }
 
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 <iostream>
 
@@ -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<TransactionContext> NullMessageStore::begin()
diff --git a/cpp/src/qpid/broker/TxAck.cpp b/cpp/src/qpid/broker/TxAck.cpp
index 60d8049102..b02e669f02 100644
--- a/cpp/src/qpid/broker/TxAck.cpp
+++ b/cpp/src/qpid/broker/TxAck.cpp
@@ -19,6 +19,7 @@
  *
  */
 #include "TxAck.h"
+#include "qpid/log/Statement.h"
 
 using std::bind1st;
 using std::bind2nd;
@@ -40,7 +41,7 @@ bool TxAck::prepare(TransactionContext* ctxt) throw(){
         }
         return true;
     }catch(...){
-        std::cout << "TxAck::prepare() - Failed to prepare" << std::endl;
+        QPID_LOG(error, "Failed to prepare");
         return false;
     }
 }
diff --git a/cpp/src/qpid/broker/TxPublish.cpp b/cpp/src/qpid/broker/TxPublish.cpp
index 687505909c..6e03f37dcd 100644
--- a/cpp/src/qpid/broker/TxPublish.cpp
+++ b/cpp/src/qpid/broker/TxPublish.cpp
@@ -18,6 +18,7 @@
  * under the License.
  *
  */
+#include "qpid/log/Statement.h"
 #include "TxPublish.h"
 
 using namespace qpid::broker;
@@ -29,7 +30,7 @@ bool TxPublish::prepare(TransactionContext* ctxt) throw(){
         for_each(queues.begin(), queues.end(), Prepare(ctxt, msg));
         return true;
     }catch(...){
-        std::cout << "TxPublish::prepare() - Failed to prepare" << std::endl;
+        QPID_LOG(error, "Failed to prepare");
         return false;
     }
 }