X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ffilter_log.cpp;h=cb3b67d61cfaa025dde77079c29976f797341f41;hb=77dee8966dd1304a0fb8540c3fc68d02dc6ce84a;hp=a1f0ad7ab8061e3def2ec20d8e19fbd772447280;hpb=ced440c14eaf1e9408f994ef1e7be2deb8a7db0b;p=metaproxy-moved-to-github.git

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index a1f0ad7..cb3b67d 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_log.cpp,v 1.4 2005-10-16 16:05:44 adam Exp $
+/* $Id: filter_log.cpp,v 1.8 2005-10-30 17:13:36 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -11,46 +11,75 @@
 #include "router.hpp"
 #include "package.hpp"
 
+#include "util.hpp"
 #include "filter_log.hpp"
 
 #include <yaz/zgdu.h>
 #include <yaz/log.h>
 
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <iostream>
 
+
 yp2::filter::Log::Log() {}
+yp2::filter::Log::Log(const std::string &msg) : m_msg(msg) {}
 
 void yp2::filter::Log::process(Package &package) const {
 
     Z_GDU *gdu;
 
-    std::cout << "---- req id=" << package.session().id();
-
-    std::cout << " close=" << (package.session().is_closed() ? "yes" : "no")
-              << "\n";
-    gdu = package.request().get();
-    if (gdu)
-    {
-	ODR odr = odr_createmem(ODR_PRINT);
-	z_GDU(odr, &gdu, 0, 0);
-	odr_destroy(odr);
+    // getting timestamp for receiving of package
+    boost::posix_time::ptime receive_time
+        = boost::posix_time::microsec_clock::local_time();
+
+    // scope for locking Ostream 
+    { 
+        boost::mutex::scoped_lock scoped_lock(m_log_mutex);
+        std::cout << receive_time << " " << m_msg;
+        std::cout << " request id=" << package.session().id();
+        std::cout << " close=" 
+                  << (package.session().is_closed() ? "yes" : "no")
+                  << "\n";
+        gdu = package.request().get();
+        if (gdu)
+        {
+            yp2::odr odr(ODR_PRINT);
+            z_GDU(odr, &gdu, 0, 0);
+        }
     }
-    package.move();
 
+    // unlocked during move
+    package.move();
 
-    std::cout << "---- res id=" << package.session().id();
-
-    std::cout << " close=" << (package.session().is_closed() ? "yes" : "no")
-              << "\n";
-    gdu = package.response().get();
-    if (gdu)
-    {
-	ODR odr = odr_createmem(ODR_PRINT);
-	z_GDU(odr, &gdu, 0, 0);
-	odr_destroy(odr);
+    // getting timestamp for sending of package
+    boost::posix_time::ptime send_time
+        = boost::posix_time::microsec_clock::local_time();
+
+    boost::posix_time::time_duration duration = send_time - receive_time;
+
+    // scope for locking Ostream 
+    { 
+        boost::mutex::scoped_lock scoped_lock(m_log_mutex);
+        std::cout << send_time << " " << m_msg;
+        std::cout << " response id=" << package.session().id();
+        std::cout << " close=" 
+                  << (package.session().is_closed() ? "yes " : "no ")
+                  << "duration=" << duration      
+                  << "\n";
+            //<< "duration=" << duration.total_seconds() 
+            //    << "." << duration.fractional_seconds()
+            //      << "\n";
+        gdu = package.response().get();
+        if (gdu)
+        {
+            yp2::odr odr(ODR_PRINT);
+            z_GDU(odr, &gdu, 0, 0);
+        }
     }
 }
 
+// defining and initializing static members
+boost::mutex yp2::filter::Log::m_log_mutex;
 
 /*
  * Local variables: