X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ffilter_log.cpp;h=84b43082df70835aec4150906f528cf2f9247dc3;hb=b70b9ec78f0ab1c3ed3b432de986159129a0e4ed;hp=fc457bb64210b6e39a86d0f2ed83b702f411b1fa;hpb=8db6e2826e50fb4d3f8e6a1287b06357409cf88b;p=metaproxy-moved-to-github.git

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index fc457bb..84b4308 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,79 +1,205 @@
-/* $Id: filter_log.cpp,v 1.19 2006-06-19 13:08:00 adam Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* $Id: filter_log.cpp,v 1.28 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, 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;
 
 namespace metaproxy_1 {
     namespace filter {
-        class Log::LFile {
+
+        class Log::Impl {
         public:
-            boost::mutex m_mutex;
-            std::string m_fname;
-            std::ofstream out;
-            LFile(std::string fname);
-        };
-        typedef boost::shared_ptr<Log::LFile> LFilePtr;
-        class Log::Rep {
-            friend class Log;
-            Rep();
+            class LFile;
+            typedef boost::shared_ptr<Log::Impl::LFile> LFilePtr;
+        public:
+            //Impl();
+            Impl(const std::string &x = "");
+           ~Impl();
+            void process(metaproxy_1::Package & package) const;
+            void configure(const xmlNode * ptr);
+        private:
             void openfile(const std::string &fname);
-            std::string m_msg;
-            LFilePtr m_file;
+            // needs to be static to be called by C pointer-to-function-syntax
+            static void stream_write(ODR o, void *handle, int type, 
+                              const char *buf, int len);
+            // needs to be static to be called by C pointer-to-function-syntax
+            static void option_write(const char *name, void *handle);
+        private:
+            std::string m_msg_config;
+            bool m_access;
             bool m_req_apdu;
             bool m_res_apdu;
             bool m_req_session;
             bool m_res_session;
+            bool m_init_options;
+            LFilePtr m_file;
+            // Only used during configure stage (no threading), 
+            // for performance avoid opening files which other log filter 
+            // instances already have opened
+            static std::list<LFilePtr> filter_log_files;
+       };
+
+        class Log::Impl::LFile {
+        public:
+            boost::mutex m_mutex;
+            std::string m_fname;
+            std::ofstream fout;
+            std::ostream &out;
+            LFile(std::string fname);
+            LFile(std::string fname, std::ostream &use_this);
         };
-        // Only used during configure stage (no threading)
-        static std::list<LFilePtr> filter_log_files;
+        
     }
 }
 
-yf::Log::Rep::Rep()
+// define Pimpl wrapper forwarding to Impl
+ 
+yf::Log::Log() : m_p(new Impl)
+{
+}
+
+yf::Log::Log(const std::string &x) : m_p(new Impl(x))
 {
-    m_req_apdu = true;
-    m_res_apdu = true;
-    m_req_session = true;
-    m_res_session = true;
 }
 
-yf::Log::Log(const std::string &x) : m_p(new Rep)
+yf::Log::~Log()
+{  // must have a destructor because of boost::scoped_ptr
+}
+
+void yf::Log::configure(const xmlNode *xmlnode)
 {
-    m_p->m_msg = x;
+    m_p->configure(xmlnode);
 }
 
-yf::Log::Log() : m_p(new Rep)
+void yf::Log::process(mp::Package &package) const
 {
+    m_p->process(package);
 }
 
-yf::Log::~Log() {}
 
-void stream_write(ODR o, void *handle, int type, const char *buf, int len)
+// define Implementation stuff
+
+// static initialization
+std::list<yf::Log::Impl::LFilePtr> yf::Log::Impl::filter_log_files;
+
+
+// yf::Log::Impl::Impl()
+// {
+//     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::Impl::Impl(const std::string &x)
+    : m_msg_config(x),
+      m_access(true),
+      m_req_apdu(false),
+      m_res_apdu(false),
+      m_req_session(false),
+      m_res_session(false),
+      m_init_options(false)
 {
-    yf::Log::LFile *lfile = (yf::Log::LFile*) handle;
-    lfile->out.write(buf, len);
+    openfile("");
 }
 
-void yf::Log::process(mp::Package &package) const
+
+yf::Log::Impl::~Impl() 
+{
+}
+
+
+void yf::Log::Impl::configure(const xmlNode *ptr)
+{
+    for (ptr = ptr->children; ptr; ptr = ptr->next)
+    {
+        if (ptr->type != XML_ELEMENT_NODE)
+            continue;
+        if (!strcmp((const char *) ptr->name, "message"))
+            m_msg_config = mp::xml::get_text(ptr);
+        else if (!strcmp((const char *) ptr->name, "filename"))
+        {
+            std::string fname = mp::xml::get_text(ptr);
+            openfile(fname);
+        }
+        else if (!strcmp((const char *) ptr->name, "category"))
+        {
+            const struct _xmlAttr *attr;
+            for (attr = ptr->properties; attr; attr = attr->next)
+            {
+                if (!strcmp((const char *) attr->name, 
+                                 "access"))
+                    m_access = 
+                        mp::xml::get_bool(attr->children, true);
+                else if (!strcmp((const char *) attr->name, "request-apdu"))
+                    m_req_apdu = mp::xml::get_bool(attr->children, true);
+                else if (!strcmp((const char *) attr->name, "response-apdu"))
+                    m_res_apdu = mp::xml::get_bool(attr->children, true);
+                else if (!strcmp((const char *) attr->name, "apdu"))
+                {
+                    m_req_apdu = mp::xml::get_bool(attr->children, true);
+                    m_res_apdu = m_req_apdu;
+                }
+                else if (!strcmp((const char *) attr->name,
+                                 "request-session"))
+                    m_req_session = 
+                        mp::xml::get_bool(attr->children, true);
+                else if (!strcmp((const char *) attr->name, 
+                                 "response-session"))
+                    m_res_session = 
+                        mp::xml::get_bool(attr->children, true);
+                else if (!strcmp((const char *) attr->name,
+                                 "session"))
+                {
+                    m_req_session = 
+                        mp::xml::get_bool(attr->children, true);
+                    m_res_session = m_req_session;
+                }
+                else if (!strcmp((const char *) attr->name, 
+                                 "init-options"))
+                    m_init_options = 
+                        mp::xml::get_bool(attr->children, true);
+                else
+                    throw mp::filter::FilterException(
+                        "Bad attribute " + std::string((const char *)
+                                                       attr->name));
+            }
+        }
+        else
+        {
+            throw mp::filter::FilterException("Bad element " 
+                                               + std::string((const char *)
+                                                             ptr->name));
+        }
+    }
+}
+
+void yf::Log::Impl::process(mp::Package &package) const
 {
     Z_GDU *gdu;
 
@@ -81,31 +207,66 @@ 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);
+        boost::mutex::scoped_lock scoped_lock(m_file->m_mutex);
         
-        if (m_p->m_req_session)
+ 
+        if (m_access)
         {
-            m_p->m_file->out << receive_time << " " << m_p->m_msg;
-            m_p->m_file->out << " request id=" << package.session().id();
-            m_p->m_file->out << " close=" 
+            gdu = package.request().get();
+            if (gdu)          
+            {
+                m_file->out
+                    //<< receive_time << " "
+                    //<< to_iso_string(receive_time) << " "
+                    << to_iso_extended_string(receive_time) << " "
+                    << m_msg_config << " "
+                    << package << " "
+                    << "000000.000000" << " " 
+                    << *gdu
+                    << "\n";
+            }
+        }
+
+        if (m_req_session)
+        {
+            m_file->out << receive_time << " " << m_msg_config;
+            m_file->out << " request id=" << package.session().id();
+            m_file->out << " close=" 
                              << (package.session().is_closed() ? "yes" : "no")
                              << "\n";
         }
-        if (m_p->m_req_apdu)
+
+        if (m_init_options)
+        {
+            gdu = package.request().get();
+            if (gdu && gdu->which == Z_GDU_Z3950 &&
+                gdu->u.z3950->which == Z_APDU_initRequest)
+            {
+                m_file->out << receive_time << " " << m_msg_config;
+                m_file->out << " init options:";
+                yaz_init_opt_decode(gdu->u.z3950->u.initRequest->options,
+                                    option_write, m_file.get());
+                m_file->out << "\n";
+            }
+        }
+        
+        if (m_req_apdu)
         {
             gdu = package.request().get();
             if (gdu)
             {
                 mp::odr odr(ODR_PRINT);
-                odr_set_stream(odr, m_p->m_file.get(), stream_write, 0);
+                odr_set_stream(odr, m_file.get(), stream_write, 0);
                 z_GDU(odr, &gdu, 0, 0);
             }
         }
-        m_p->m_file->out.flush();
+        m_file->out.flush();
     }
-
+    
     // unlocked during move
     package.move();
 
@@ -117,38 +278,69 @@ 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_res_session)
+        boost::mutex::scoped_lock scoped_lock(m_file->m_mutex);
+
+        if (m_access)
+        {
+            gdu = package.response().get();
+            if (gdu)
+            {
+                m_file->out
+                    //<< send_time << " "
+                    //<< to_iso_string(send_time) << " "
+                    << to_iso_extended_string(send_time) << " "
+                    << m_msg_config << " "
+                    << package << " "
+                    << to_iso_string(duration) << " "
+                    << *gdu
+                    << "\n";
+            }   
+        }
+
+        if (m_res_session)
         {
-            m_p->m_file->out << send_time << " " << m_p->m_msg;
-            m_p->m_file->out << " response id=" << package.session().id();
-            m_p->m_file->out << " close=" 
+            m_file->out << send_time << " " << m_msg_config;
+            m_file->out << " response id=" << package.session().id();
+            m_file->out << " close=" 
                              << (package.session().is_closed() ? "yes " : "no ")
                              << "duration=" << duration      
                              << "\n";
         }
-        if (m_p->m_res_apdu)
+
+        if (m_init_options)
+        {
+            gdu = package.response().get();
+            if (gdu && gdu->which == Z_GDU_Z3950 &&
+                gdu->u.z3950->which == Z_APDU_initResponse)
+            {
+                m_file->out << receive_time << " " << m_msg_config;
+                m_file->out << " init options:";
+                yaz_init_opt_decode(gdu->u.z3950->u.initResponse->options,
+                                    option_write, m_file.get());
+                m_file->out << "\n";
+            }
+        }
+        
+        if (m_res_apdu)
         {
             gdu = package.response().get();
             if (gdu)
             {
                 mp::odr odr(ODR_PRINT);
-                odr_set_stream(odr, m_p->m_file.get(), stream_write, 0);
+                odr_set_stream(odr, m_file.get(), stream_write, 0);
                 z_GDU(odr, &gdu, 0, 0);
             }
         }
-        m_p->m_file->out.flush();
+        
+        m_file->out.flush();
     }
 }
 
-yf::Log::LFile::LFile(std::string fname) : m_fname(fname)
-{
-    out.open(fname.c_str());
-}
 
-void yf::Log::Rep::openfile(const std::string &fname)
+void yf::Log::Impl::openfile(const std::string &fname)
 {
-    std::list<LFilePtr>::const_iterator it = filter_log_files.begin();
+    std::list<LFilePtr>::const_iterator it
+        = filter_log_files.begin();
     for (; it != filter_log_files.end(); it++)
     {
         if ((*it)->m_fname == fname)
@@ -157,58 +349,41 @@ 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;
 }
 
-void yf::Log::configure(const xmlNode *ptr)
+
+void yf::Log::Impl::stream_write(ODR o, void *handle, int type, const char *buf, int len)
 {
-    for (ptr = ptr->children; ptr; ptr = ptr->next)
-    {
-        if (ptr->type != XML_ELEMENT_NODE)
-            continue;
-        if (!strcmp((const char *) ptr->name, "message"))
-            m_p->m_msg = mp::xml::get_text(ptr);
-        else if (!strcmp((const char *) ptr->name, "filename"))
-        {
-            std::string fname = mp::xml::get_text(ptr);
-            m_p->openfile(fname);
-        }
-        else if (!strcmp((const char *) ptr->name, "category"))
-        {
-            const struct _xmlAttr *attr;
-            for (attr = ptr->properties; attr; attr = attr->next)
-            {
-                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);
-                else if (!strcmp((const char *) attr->name,
-                                 "request-session"))
-                    m_p->m_req_session = 
-                        mp::xml::get_bool(attr->children, true);
-                else if (!strcmp((const char *) attr->name, 
-                                 "response-session"))
-                    m_p->m_res_session = 
-                        mp::xml::get_bool(attr->children, true);
-                else
-                    throw mp::filter::FilterException(
-                        "Bad attribute " + std::string((const char *)
-                                                       attr->name));
-            }
-        }
-        else
-        {
-            throw mp::filter::FilterException("Bad element " 
-                                               + std::string((const char *)
-                                                             ptr->name));
-        }
-    }
-    if (!m_p->m_file)
-        m_p->openfile("metaproxy.log");
+    yf::Log::Impl::LFile *lfile = (yf::Log::Impl::LFile*) handle;
+    lfile->out.write(buf, len);
 }
 
+void yf::Log::Impl::option_write(const char *name, void *handle)
+{
+    yf::Log::Impl::LFile *lfile = (yf::Log::Impl::LFile*) handle;
+    lfile->out << " " << name;
+}
+
+
+yf::Log::Impl::LFile::LFile(std::string fname) : 
+    m_fname(fname), fout(fname.c_str()), out(fout)
+{
+}
+
+yf::Log::Impl::LFile::LFile(std::string fname, std::ostream &use_this) : 
+    m_fname(fname), out(use_this)
+{
+}
+
+
+
+
 static mp::filter::Base* filter_creator()
 {
     return new mp::filter::Log;