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

diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index 86ee793..34a335c 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_log.cpp,v 1.11 2006-01-04 11:55:31 adam Exp $
+/* $Id: filter_log.cpp,v 1.16 2006-01-17 15:08:02 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -6,8 +6,6 @@
 
 #include "config.hpp"
 
-#include "filter.hpp"
-#include "router.hpp"
 #include "package.hpp"
 
 #include <string>
@@ -25,14 +23,12 @@ namespace yp2 {
     namespace filter {
         class Log::Rep {
             friend class Log;
-            static boost::mutex m_log_mutex;
+            boost::mutex m_log_mutex;
             std::string m_msg;
         };
     }
 }
 
-boost::mutex yf::Log::Rep::m_log_mutex;
-
 yf::Log::Log(const std::string &x) : m_p(new Rep)
 {
     m_p->m_msg = x;
@@ -44,7 +40,7 @@ yf::Log::Log() : m_p(new Rep)
 
 yf::Log::~Log() {}
 
-void yf::Log::process(Package &package) const
+void yf::Log::process(yp2::Package &package) const
 {
     Z_GDU *gdu;
 
@@ -54,7 +50,7 @@ void yf::Log::process(Package &package) const
 
     // scope for locking Ostream 
     { 
-        boost::mutex::scoped_lock scoped_lock(Rep::m_log_mutex);
+        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=" 
@@ -79,7 +75,7 @@ void yf::Log::process(Package &package) const
 
     // scope for locking Ostream 
     { 
-        boost::mutex::scoped_lock scoped_lock(Rep::m_log_mutex);
+        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=" 
@@ -98,6 +94,23 @@ void yf::Log::process(Package &package) const
     }
 }
 
+void yf::Log::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_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;