X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ffilter_log.cpp;h=2e60d6d422ad5398f5cce9148dc5e7da5630affe;hb=4f255e4396867c12c79da88ac82e93daac6b4cc4;hp=c4ec3a3c94276fe2f3c383c3ac02c5b15ab4f301;hpb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;p=metaproxy-moved-to-github.git

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index c4ec3a3..2e60d6d 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_log.cpp,v 1.18 2006-06-10 14:29:12 adam Exp $
+/* $Id: filter_log.cpp,v 1.21 2006-06-21 12:50:35 adam Exp $
    Copyright (c) 2005-2006, Index Data.
 
    See the LICENSE file for details
@@ -13,23 +13,54 @@
 #include <boost/date_time/posix_time/posix_time.hpp>
 
 #include "util.hpp"
+#include "xmlutil.hpp"
 #include "filter_log.hpp"
 
+#include <fstream>
 #include <yaz/zgdu.h>
 
 namespace mp = metaproxy_1;
-namespace yf = mp::filter;
+namespace yf = metaproxy_1::filter;
 
 namespace metaproxy_1 {
     namespace filter {
+        class Log::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);
+        };
+        typedef boost::shared_ptr<Log::LFile> LFilePtr;
         class Log::Rep {
             friend class Log;
-            boost::mutex m_log_mutex;
+            Rep();
+            void openfile(const std::string &fname);
             std::string m_msg;
+            LFilePtr m_file;
+            bool m_req_apdu;
+            bool m_res_apdu;
+            bool m_req_session;
+            bool m_res_session;
+            bool m_init_options;
         };
+        // Only used during configure stage (no threading)
+        static std::list<LFilePtr> filter_log_files;
     }
 }
 
+yf::Log::Rep::Rep()
+{
+    m_req_apdu = true;
+    m_res_apdu = true;
+    m_req_session = true;
+    m_res_session = true;
+    m_init_options = false;
+    openfile("");
+}
+
 yf::Log::Log(const std::string &x) : m_p(new Rep)
 {
     m_p->m_msg = x;
@@ -41,6 +72,18 @@ yf::Log::Log() : m_p(new Rep)
 
 yf::Log::~Log() {}
 
+void stream_write(ODR o, void *handle, int type, const char *buf, int len)
+{
+    yf::Log::LFile *lfile = (yf::Log::LFile*) handle;
+    lfile->out.write(buf, len);
+}
+
+void option_write(const char *name, void *handle)
+{
+    yf::Log::LFile *lfile = (yf::Log::LFile*) handle;
+    lfile->out << " " << name;
+}
+
 void yf::Log::process(mp::Package &package) const
 {
     Z_GDU *gdu;
@@ -51,18 +94,41 @@ void yf::Log::process(mp::Package &package) const
 
     // 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)
+        boost::mutex::scoped_lock scoped_lock(m_p->m_file->m_mutex);
+        
+        if (m_p->m_req_session)
         {
-            mp::odr odr(ODR_PRINT);
-            z_GDU(odr, &gdu, 0, 0);
+            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=" 
+                             << (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 << " 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();
+            if (gdu)
+            {
+                mp::odr odr(ODR_PRINT);
+                odr_set_stream(odr, m_p->m_file.get(), stream_write, 0);
+                z_GDU(odr, &gdu, 0, 0);
+            }
+        }
+        m_p->m_file->out.flush();
     }
 
     // unlocked during move
@@ -76,25 +142,72 @@ void yf::Log::process(mp::Package &package) const
 
     // 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)
+        boost::mutex::scoped_lock scoped_lock(m_p->m_file->m_mutex);
+        if (m_p->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=" 
+                             << (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 << " 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)
         {
-            mp::odr odr(ODR_PRINT);
-            z_GDU(odr, &gdu, 0, 0);
+            gdu = package.response().get();
+            if (gdu)
+            {
+                mp::odr odr(ODR_PRINT);
+                odr_set_stream(odr, m_p->m_file.get(), stream_write, 0);
+                z_GDU(odr, &gdu, 0, 0);
+            }
         }
+        m_p->m_file->out.flush();
     }
 }
 
+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)
+{
+}
+
+void yf::Log::Rep::openfile(const std::string &fname)
+{
+    std::list<LFilePtr>::const_iterator it = filter_log_files.begin();
+    for (; it != filter_log_files.end(); it++)
+    {
+        if ((*it)->m_fname == fname)
+        {
+            m_file = *it;
+            return;
+        }
+    }
+    // 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)
 {
     for (ptr = ptr->children; ptr; ptr = ptr->next)
@@ -103,6 +216,50 @@ void yf::Log::configure(const xmlNode *ptr)
             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, "apdu"))
+                {
+                    m_p->m_req_apdu = mp::xml::get_bool(attr->children, true);
+                    m_p->m_res_apdu = m_p->m_req_apdu;
+                }
+                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 if (!strcmp((const char *) attr->name,
+                                 "session"))
+                {
+                    m_p->m_req_session = 
+                        mp::xml::get_bool(attr->children, true);
+                    m_p->m_res_session = m_p->m_req_session;
+                }
+                else if (!strcmp((const char *) attr->name, 
+                                 "init-options"))
+                    m_p->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 " 
@@ -125,7 +282,6 @@ extern "C" {
     };
 }
 
-
 /*
  * Local variables:
  * c-basic-offset: 4