X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_log.cpp;h=bd5f862d616470ac99d1d95abc4796c1fc7b0baf;hb=4c42fcd314fe52e0a896b08ed9d818bf6f323fe7;hp=a1f0ad7ab8061e3def2ec20d8e19fbd772447280;hpb=ced440c14eaf1e9408f994ef1e7be2deb8a7db0b;p=metaproxy-moved-to-github.git

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index a1f0ad7..bd5f862 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,56 +1,130 @@
-/* $Id: filter_log.cpp,v 1.4 2005-10-16 16:05:44 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: filter_log.cpp,v 1.17 2006-03-16 10:40:59 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
 %LICENSE%
  */
 
-
 #include "config.hpp"
 
-#include "filter.hpp"
-#include "router.hpp"
 #include "package.hpp"
 
+#include <string>
+#include <boost/thread/mutex.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+
+#include "util.hpp"
 #include "filter_log.hpp"
 
 #include <yaz/zgdu.h>
-#include <yaz/log.h>
 
-#include <iostream>
+namespace mp = metaproxy_1;
+namespace yf = mp::filter;
 
-yp2::filter::Log::Log() {}
+namespace metaproxy_1 {
+    namespace filter {
+        class Log::Rep {
+            friend class Log;
+            boost::mutex m_log_mutex;
+            std::string m_msg;
+        };
+    }
+}
 
-void yp2::filter::Log::process(Package &package) const {
+yf::Log::Log(const std::string &x) : m_p(new Rep)
+{
+    m_p->m_msg = x;
+}
 
-    Z_GDU *gdu;
+yf::Log::Log() : m_p(new Rep)
+{
+}
 
-    std::cout << "---- req id=" << package.session().id();
+yf::Log::~Log() {}
 
-    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);
+void yf::Log::process(mp::Package &package) const
+{
+    Z_GDU *gdu;
+
+    // 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_p->m_log_mutex);
+        std::cout << receive_time << " " << m_p->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)
+        {
+            mp::odr odr(ODR_PRINT);
+            z_GDU(odr, &gdu, 0, 0);
+        }
     }
-    package.move();
 
+    // unlocked during move
+    package.move();
 
-    std::cout << "---- res id=" << package.session().id();
+    // 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_p->m_log_mutex);
+        std::cout << send_time << " " << m_p->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)
+        {
+            mp::odr odr(ODR_PRINT);
+            z_GDU(odr, &gdu, 0, 0);
+        }
+    }
+}
 
-    std::cout << " close=" << (package.session().is_closed() ? "yes" : "no")
-              << "\n";
-    gdu = package.response().get();
-    if (gdu)
+void yf::Log::configure(const xmlNode *ptr)
+{
+    for (ptr = ptr->children; ptr; ptr = ptr->next)
     {
-	ODR odr = odr_createmem(ODR_PRINT);
-	z_GDU(odr, &gdu, 0, 0);
-	odr_destroy(odr);
+        if (ptr->type != XML_ELEMENT_NODE)
+            continue;
+        if (!strcmp((const char *) ptr->name, "message"))
+            m_p->m_msg = mp::xml::get_text(ptr);
+        else
+        {
+            throw mp::filter::FilterException("Bad element " 
+                                               + std::string((const char *)
+                                                             ptr->name));
+        }
     }
 }
 
+static mp::filter::Base* filter_creator()
+{
+    return new mp::filter::Log;
+}
+
+extern "C" {
+    struct metaproxy_1_filter_struct metaproxy_1_filter_log = {
+        0,
+        "log",
+        filter_creator
+    };
+}
+
 
 /*
  * Local variables: