X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_log.cpp;h=a1baf483f6a479271ba0b2f871b1156fb16264e7;hb=5beddc7e2432ca7eda40eacf025e9bbbbc026a86;hp=ec34a738beccd6c41c0c693bbec0d3dcb4e354f2;hpb=bde3c00f89af8a915ea7b4d0a218976d2fb94580;p=metaproxy-moved-to-github.git

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index ec34a73..a1baf48 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,23 +1,27 @@
-/* $Id: filter_log.cpp,v 1.20 2006-06-20 22:29:39 adam Exp $
+/* $Id: filter_log.cpp,v 1.26 2006-08-31 12:56:40 marc Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
  */
 
+#include "filter_log.hpp"
 #include "config.hpp"
-
 #include "package.hpp"
 
 #include <string>
+#include <sstream>
 #include <boost/thread/mutex.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
 
+#include "gduutil.hpp"
 #include "util.hpp"
 #include "xmlutil.hpp"
-#include "filter_log.hpp"
 
 #include <fstream>
 #include <yaz/zgdu.h>
+#include <yaz/wrbuf.h>
+#include <yaz/querytowrbuf.h>
+
 
 namespace mp = metaproxy_1;
 namespace yf = metaproxy_1::filter;
@@ -28,16 +32,19 @@ namespace metaproxy_1 {
         public:
             boost::mutex m_mutex;
             std::string m_fname;
-            std::ofstream out;
+            std::ofstream fout;
+            std::ostream &out;
             LFile(std::string fname);
+            LFile(std::string fname, std::ostream &use_this);
         };
         typedef boost::shared_ptr<Log::LFile> LFilePtr;
         class Log::Rep {
             friend class Log;
             Rep();
             void openfile(const std::string &fname);
-            std::string m_msg;
+            std::string m_msg_config;
             LFilePtr m_file;
+            bool m_access;
             bool m_req_apdu;
             bool m_res_apdu;
             bool m_req_session;
@@ -51,16 +58,18 @@ namespace metaproxy_1 {
 
 yf::Log::Rep::Rep()
 {
-    m_req_apdu = true;
-    m_res_apdu = true;
-    m_req_session = true;
-    m_res_session = true;
+    m_access = true;
+    m_req_apdu = false;
+    m_res_apdu = false;
+    m_req_session = false;
+    m_res_session = false;
     m_init_options = false;
+    openfile("");
 }
 
 yf::Log::Log(const std::string &x) : m_p(new Rep)
 {
-    m_p->m_msg = x;
+    m_p->m_msg_config = x;
 }
 
 yf::Log::Log() : m_p(new Rep)
@@ -89,32 +98,53 @@ void yf::Log::process(mp::Package &package) const
     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_file->m_mutex);
         
+ 
+        if (m_p->m_access)
+        {
+            gdu = package.request().get();
+            if (gdu)          
+            {
+                m_p->m_file->out
+                    //<< receive_time << " "
+                    //<< to_iso_string(receive_time) << " "
+                    << to_iso_extended_string(receive_time) << " "
+                    << m_p->m_msg_config << " "
+                    << package << " "
+                    << "000000.000000" << " " 
+                    << *gdu
+                    << "\n";
+            }
+        }
+
         if (m_p->m_req_session)
         {
-            m_p->m_file->out << receive_time << " " << m_p->m_msg;
+            m_p->m_file->out << receive_time << " " << m_p->m_msg_config;
             m_p->m_file->out << " request id=" << package.session().id();
             m_p->m_file->out << " close=" 
                              << (package.session().is_closed() ? "yes" : "no")
                              << "\n";
         }
+
         if (m_p->m_init_options)
         {
             gdu = package.request().get();
             if (gdu && gdu->which == Z_GDU_Z3950 &&
                 gdu->u.z3950->which == Z_APDU_initRequest)
             {
-                m_p->m_file->out << receive_time << " " << m_p->m_msg;
+                m_p->m_file->out << receive_time << " " << m_p->m_msg_config;
                 m_p->m_file->out << " init options:";
                 yaz_init_opt_decode(gdu->u.z3950->u.initRequest->options,
                                     option_write, m_p->m_file.get());
                 m_p->m_file->out << "\n";
             }
         }
-
+        
         if (m_p->m_req_apdu)
         {
             gdu = package.request().get();
@@ -127,7 +157,7 @@ void yf::Log::process(mp::Package &package) const
         }
         m_p->m_file->out.flush();
     }
-
+    
     // unlocked during move
     package.move();
 
@@ -140,28 +170,48 @@ void yf::Log::process(mp::Package &package) const
     // scope for locking Ostream 
     { 
         boost::mutex::scoped_lock scoped_lock(m_p->m_file->m_mutex);
+
+        if (m_p->m_access)
+        {
+            gdu = package.response().get();
+            if (gdu)
+            {
+                m_p->m_file->out
+                    //<< send_time << " "
+                    //<< to_iso_string(send_time) << " "
+                    << to_iso_extended_string(send_time) << " "
+                    << m_p->m_msg_config << " "
+                    << package << " "
+                    << to_iso_string(duration) << " "
+                    << *gdu
+                    << "\n";
+            }   
+        }
+
         if (m_p->m_res_session)
         {
-            m_p->m_file->out << send_time << " " << m_p->m_msg;
+            m_p->m_file->out << send_time << " " << m_p->m_msg_config;
             m_p->m_file->out << " response id=" << package.session().id();
             m_p->m_file->out << " close=" 
                              << (package.session().is_closed() ? "yes " : "no ")
                              << "duration=" << duration      
                              << "\n";
         }
+
         if (m_p->m_init_options)
         {
             gdu = package.response().get();
             if (gdu && gdu->which == Z_GDU_Z3950 &&
                 gdu->u.z3950->which == Z_APDU_initResponse)
             {
-                m_p->m_file->out << receive_time << " " << m_p->m_msg;
+                m_p->m_file->out << receive_time << " " << m_p->m_msg_config;
                 m_p->m_file->out << " init options:";
                 yaz_init_opt_decode(gdu->u.z3950->u.initResponse->options,
                                     option_write, m_p->m_file.get());
                 m_p->m_file->out << "\n";
             }
         }
+        
         if (m_p->m_res_apdu)
         {
             gdu = package.response().get();
@@ -172,13 +222,19 @@ void yf::Log::process(mp::Package &package) const
                 z_GDU(odr, &gdu, 0, 0);
             }
         }
+        
         m_p->m_file->out.flush();
     }
 }
 
-yf::Log::LFile::LFile(std::string fname) : m_fname(fname)
+yf::Log::LFile::LFile(std::string fname) : 
+    m_fname(fname), fout(fname.c_str()), out(fout)
+{
+}
+
+yf::Log::LFile::LFile(std::string fname, std::ostream &use_this) : 
+    m_fname(fname), out(use_this)
 {
-    out.open(fname.c_str());
 }
 
 void yf::Log::Rep::openfile(const std::string &fname)
@@ -192,7 +248,10 @@ void yf::Log::Rep::openfile(const std::string &fname)
             return;
         }
     }
-    LFilePtr newfile(new LFile(fname));
+    // open stdout for empty file
+    LFilePtr newfile(fname.length() == 0 
+                     ? new LFile(fname, std::cout) 
+                     : new LFile(fname));
     filter_log_files.push_back(newfile);
     m_file = newfile;
 }
@@ -204,7 +263,7 @@ void yf::Log::configure(const xmlNode *ptr)
         if (ptr->type != XML_ELEMENT_NODE)
             continue;
         if (!strcmp((const char *) ptr->name, "message"))
-            m_p->m_msg = mp::xml::get_text(ptr);
+            m_p->m_msg_config = mp::xml::get_text(ptr);
         else if (!strcmp((const char *) ptr->name, "filename"))
         {
             std::string fname = mp::xml::get_text(ptr);
@@ -215,7 +274,11 @@ void yf::Log::configure(const xmlNode *ptr)
             const struct _xmlAttr *attr;
             for (attr = ptr->properties; attr; attr = attr->next)
             {
-                if (!strcmp((const char *) attr->name, "request-apdu"))
+                if (!strcmp((const char *) attr->name, 
+                                 "access"))
+                    m_p->m_access = 
+                        mp::xml::get_bool(attr->children, true);
+                else if (!strcmp((const char *) attr->name, "request-apdu"))
                     m_p->m_req_apdu = mp::xml::get_bool(attr->children, true);
                 else if (!strcmp((const char *) attr->name, "response-apdu"))
                     m_p->m_res_apdu = mp::xml::get_bool(attr->children, true);
@@ -256,8 +319,6 @@ void yf::Log::configure(const xmlNode *ptr)
                                                              ptr->name));
         }
     }
-    if (!m_p->m_file)
-        m_p->openfile("metaproxy.log");
 }
 
 static mp::filter::Base* filter_creator()