Re-enabled tracing of requests sent and received.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@475266 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 11 insertions, 8 deletions

diff --git a/cpp/src/qpid/apr/APRAcceptor.cpp b/cpp/src/qpid/apr/APRAcceptor.cpp
index 644b7b6b9e..43fcbc7f8e 100644
--- a/cpp/src/qpid/apr/APRAcceptor.cpp
+++ b/cpp/src/qpid/apr/APRAcceptor.cpp
@@ -31,28 +31,30 @@ namespace sys {
 class APRAcceptor : public Acceptor
 {
   public:
-    APRAcceptor(int16_t port, int backlog, int threads);
+    APRAcceptor(int16_t port, int backlog, int threads, bool trace);
     virtual int16_t getPort() const;
     virtual void run(qpid::sys::SessionHandlerFactory* factory);
     virtual void shutdown();
 
   private:
     int16_t port;
+    bool trace;
     LFProcessor processor;
     apr_socket_t* socket;
     volatile bool running;
 };
 
 // Define generic Acceptor::create() to return APRAcceptor.
-Acceptor::shared_ptr Acceptor::create(int16_t port, int backlog, int threads)
+Acceptor::shared_ptr Acceptor::create(int16_t port, int backlog, int threads, bool trace)
 {
-    return Acceptor::shared_ptr(new APRAcceptor(port, backlog, threads));
+    return Acceptor::shared_ptr(new APRAcceptor(port, backlog, threads, trace));
 }
 // Must define Acceptor virtual dtor.
 Acceptor::~Acceptor() {}
 
-APRAcceptor::APRAcceptor(int16_t port_, int backlog, int threads) :
+    APRAcceptor::APRAcceptor(int16_t port_, int backlog, int threads, bool trace_) :
     port(port_),
+    trace(trace_),
     processor(APRPool::get(), threads, 1000, 5000000)
 {
     apr_sockaddr_t* address;
@@ -83,7 +85,7 @@ void APRAcceptor::run(SessionHandlerFactory* factory) {
             CHECK_APR_SUCCESS(apr_socket_opt_set(client, APR_TCP_NODELAY, 1));
             CHECK_APR_SUCCESS(apr_socket_opt_set(client, APR_SO_SNDBUF, 32768));
             CHECK_APR_SUCCESS(apr_socket_opt_set(client, APR_SO_RCVBUF, 32768));
-            LFSessionContext* session = new LFSessionContext(APRPool::get(), client, &processor, false);
+            LFSessionContext* session = new LFSessionContext(APRPool::get(), client, &processor, trace);
             session->init(factory->create(session));
         }else{
             running = false;
diff --git a/cpp/src/qpid/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index 3f0f00377d..4750dea591 100644
--- a/cpp/src/qpid/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -29,7 +29,8 @@ using namespace qpid::sys;
 Broker::Broker(const Configuration& config) :
     acceptor(Acceptor::create(config.getPort(),
                               config.getConnectionBacklog(),
-                              config.getWorkerThreads())),
+                              config.getWorkerThreads(),
+                              config.isTrace())),
     factory(config.getStore())
 { }
 
diff --git a/cpp/src/qpid/posix/PosixAcceptor.cpp b/cpp/src/qpid/posix/PosixAcceptor.cpp
index 59d04b0737..9b37766e5c 100644
--- a/cpp/src/qpid/posix/PosixAcceptor.cpp
+++ b/cpp/src/qpid/posix/PosixAcceptor.cpp
@@ -37,7 +37,7 @@ class PosixAcceptor : public Acceptor {
 };
 
 // Define generic Acceptor::create() to return APRAcceptor.
-Acceptor::shared_ptr Acceptor::create(int16_t , int, int )
+    Acceptor::shared_ptr Acceptor::create(int16_t , int, int, bool)
 {
     return Acceptor::shared_ptr(new PosixAcceptor());
 }
diff --git a/cpp/src/qpid/sys/Acceptor.h b/cpp/src/qpid/sys/Acceptor.h
index 88938d57c3..c493a48f0e 100644
--- a/cpp/src/qpid/sys/Acceptor.h
+++ b/cpp/src/qpid/sys/Acceptor.h
@@ -33,7 +33,7 @@ class SessionHandlerFactory;
 class Acceptor : public qpid::SharedObject<Acceptor>
 {
   public:
-    static Acceptor::shared_ptr create(int16_t port, int backlog, int threads);
+    static Acceptor::shared_ptr create(int16_t port, int backlog, int threads, bool trace = false);
     virtual ~Acceptor() = 0;
     virtual int16_t getPort() const = 0;
     virtual void run(qpid::sys::SessionHandlerFactory* factory) = 0;