X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_log.cpp;h=34a335c58a76602bcc33b63a877b54efd92a205d;hb=f47e8cf4cde2ba5465106e219c803e6424a4f177;hp=742fd2b48fca016f26ad8ce1f29f57229e54b016;hpb=f82b19f2b93707657fee804bd1242f2548d51ada;p=metaproxy-moved-to-github.git

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index 742fd2b..34a335c 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,47 +1,129 @@
-/* $Id: filter_log.cpp,v 1.3 2005-10-15 14:09:09 adam Exp $
+/* $Id: filter_log.cpp,v 1.16 2006-01-17 15:08:02 adam Exp $
    Copyright (c) 2005, 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 yf = yp2::filter;
+
+namespace yp2 {
+    namespace filter {
+        class Log::Rep {
+            friend class Log;
+            boost::mutex m_log_mutex;
+            std::string m_msg;
+        };
+    }
+}
+
+yf::Log::Log(const std::string &x) : m_p(new Rep)
+{
+    m_p->m_msg = x;
+}
 
-yp2::filter::Log::Log() {}
+yf::Log::Log() : m_p(new Rep)
+{
+}
 
-void yp2::filter::Log::process(Package &package) const {
+yf::Log::~Log() {}
 
+void yf::Log::process(yp2::Package &package) const
+{
     Z_GDU *gdu;
 
-    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_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)
+        {
+            yp2::odr odr(ODR_PRINT);
+            z_GDU(odr, &gdu, 0, 0);
+        }
     }
+
+    // unlocked during move
     package.move();
 
-    gdu = package.response().get();
-    if (gdu)
+    // 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)
+        {
+            yp2::odr odr(ODR_PRINT);
+            z_GDU(odr, &gdu, 0, 0);
+        }
+    }
+}
+
+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 = yp2::xml::get_text(ptr);
+        else
+        {
+            throw yp2::filter::FilterException("Bad element " 
+                                               + std::string((const char *)
+                                                             ptr->name));
+        }
     }
 }
 
+static yp2::filter::Base* filter_creator()
+{
+    return new yp2::filter::Log;
+}
+
+extern "C" {
+    struct yp2_filter_struct yp2_filter_log = {
+        0,
+        "log",
+        filter_creator
+    };
+}
+
 
 /*
  * Local variables: