BIND 10 trac742, updated. 876951776077fecc59acb33574bd155fc9259dbc [trac742] Debug messages in the session

[BIND 10 source code commits]

The branch, trac742 has been updated
       via  876951776077fecc59acb33574bd155fc9259dbc (commit)
      from  36c080d7a211dd69cc3ca37a8221f096828a2f4b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 876951776077fecc59acb33574bd155fc9259dbc
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Mon Jun 27 14:32:31 2011 +0200

    [trac742] Debug messages in the session

-----------------------------------------------------------------------

Summary of changes:
 src/lib/cc/cc_messages.mes |   24 ++++++++++++++++++++++++
 src/lib/cc/logger.h        |    5 +++++
 src/lib/cc/session.cc      |   21 ++++++++++++++++++++-
 3 files changed, 49 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/cc/cc_messages.mes b/src/lib/cc/cc_messages.mes
index c19cc5c..de05169 100644
--- a/src/lib/cc/cc_messages.mes
+++ b/src/lib/cc/cc_messages.mes
@@ -33,3 +33,27 @@ $NAMESPACE isc::cc
 % CC_ASYNC_READ_FAILED asynchronous read failed
 
 % CC_INVALID_LENGTHS invalid length parameters (%1, %2)
+
+% CC_ESTABLISH trying to establish connection with message queue daemon at %1
+
+% CC_ESTABLISHED successfully connected to message queue daemon
+
+% CC_DISCONNECT disconnecting from message queue daemon
+
+% CC_START_READ starting asynchronous read
+
+% CC_SUBSCRIBE subscribing to communication group %1
+
+% CC_UNSUBSCRIBE unsubscribing from communication group %1
+
+% CC_GROUP_SEND sending message '%1' to group '%2'
+
+% CC_GROUP_RECEIVE trying to receive a message
+
+% CC_GROUP_RECEIVED message arrived ('%1', '%2')
+
+% CC_NO_MESSAGE no message ready to be received yet
+
+% CC_REPLY replying to message from '%1' with '%2'
+
+% CC_SET_TIMEOUT setting timeout to %1ms
diff --git a/src/lib/cc/logger.h b/src/lib/cc/logger.h
index 0ec67dc..5ef48f8 100644
--- a/src/lib/cc/logger.h
+++ b/src/lib/cc/logger.h
@@ -21,6 +21,11 @@
 namespace isc {
 namespace cc {
 
+enum {
+    DBG_TRACE_BASIC = 10,
+    DBG_TRACE_DETAILED = 80
+};
+
 extern isc::log::Logger logger;
 
 }
diff --git a/src/lib/cc/session.cc b/src/lib/cc/session.cc
index 4729a0e..97d5cf1 100644
--- a/src/lib/cc/session.cc
+++ b/src/lib/cc/session.cc
@@ -119,8 +119,10 @@ private:
 void
 SessionImpl::establish(const char& socket_file) {
     try {
+        LOG_DEBUG(logger, DBG_TRACE_BASIC, CC_ESTABLISH).arg(socket_file);
         socket_.connect(asio::local::stream_protocol::endpoint(&socket_file),
                         error_);
+        LOG_DEBUG(logger, DBG_TRACE_BASIC, CC_ESTABLISHED);
     } catch(const asio::system_error& se) {
         LOG_FATAL(logger, CC_CONN_ERROR).arg(se.what());
         isc_throw(SessionError, se.what());
@@ -134,6 +136,7 @@ SessionImpl::establish(const char& socket_file) {
 
 void
 SessionImpl::disconnect() {
+    LOG_DEBUG(logger, DBG_TRACE_BASIC, CC_DISCONNECT);
     socket_.close();
     data_length_ = 0;
 }
@@ -265,6 +268,7 @@ Session::disconnect() {
 
 void
 Session::startRead(boost::function<void()> read_callback) {
+    LOG_DEBUG(logger, DBG_TRACE_DETAILED, CC_START_READ);
     impl_->startRead(read_callback);
 }
 
@@ -428,6 +432,7 @@ Session::recvmsg(ConstElementPtr& env, ConstElementPtr& msg,
 
 void
 Session::subscribe(std::string group, std::string instance) {
+    LOG_DEBUG(logger, DBG_TRACE_DETAILED, CC_SUBSCRIBE).arg(group);
     ElementPtr env = Element::createMap();
 
     env->set("type", Element::create("subscribe"));
@@ -439,6 +444,7 @@ Session::subscribe(std::string group, std::string instance) {
 
 void
 Session::unsubscribe(std::string group, std::string instance) {
+    LOG_DEBUG(logger, DBG_TRACE_DETAILED, CC_UNSUBSCRIBE).arg(group);
     ElementPtr env = Element::createMap();
 
     env->set("type", Element::create("unsubscribe"));
@@ -452,6 +458,8 @@ int
 Session::group_sendmsg(ConstElementPtr msg, std::string group,
                        std::string instance, std::string to)
 {
+    LOG_DEBUG(logger, DBG_TRACE_DETAILED, CC_GROUP_SEND).arg(msg->str()).
+        arg(group);
     ElementPtr env = Element::createMap();
     long int nseq = ++impl_->sequence_;
     
@@ -471,11 +479,21 @@ bool
 Session::group_recvmsg(ConstElementPtr& envelope, ConstElementPtr& msg,
                        bool nonblock, int seq)
 {
-    return (recvmsg(envelope, msg, nonblock, seq));
+    LOG_DEBUG(logger, DBG_TRACE_DETAILED, CC_GROUP_RECEIVE);
+    bool result(recvmsg(envelope, msg, nonblock, seq));
+    if (result) {
+        LOG_DEBUG(logger, DBG_TRACE_DETAILED, CC_GROUP_RECEIVED).
+            arg(envelope->str()).arg(msg->str());
+    } else {
+        LOG_DEBUG(logger, DBG_TRACE_DETAILED, CC_NO_MESSAGE);
+    }
+    return (result);
 }
 
 int
 Session::reply(ConstElementPtr envelope, ConstElementPtr newmsg) {
+    LOG_DEBUG(logger, DBG_TRACE_DETAILED, CC_REPLY).arg(envelope->str()).
+        arg(newmsg->str());
     ElementPtr env = Element::createMap();
     long int nseq = ++impl_->sequence_;
     
@@ -499,6 +517,7 @@ Session::hasQueuedMsgs() const {
 
 void
 Session::setTimeout(size_t milliseconds) {
+    LOG_DEBUG(logger, DBG_TRACE_DETAILED, CC_SET_TIMEOUT).arg(milliseconds);
     impl_->setTimeout(milliseconds);
 }