From a19294f809fc1e5481ad596faa5e604a6c84aa83 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 25 Oct 2005 16:01:36 +0000
Subject: [PATCH] Log filter has alternative constructor with custom msg

---
 src/ex_filter_frontend_net.cpp |    9 ++++++---
 src/filter_backend_test.cpp    |    5 ++++-
 src/filter_log.cpp             |    8 ++------
 src/filter_log.hpp             |    4 ++--
 src/test_filter_virt_db.cpp    |    8 +++-----
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/ex_filter_frontend_net.cpp b/src/ex_filter_frontend_net.cpp
index fd5d7d7..d382360 100644
--- a/src/ex_filter_frontend_net.cpp
+++ b/src/ex_filter_frontend_net.cpp
@@ -1,4 +1,4 @@
-/* $Id: ex_filter_frontend_net.cpp,v 1.9 2005-10-25 15:19:58 adam Exp $
+/* $Id: ex_filter_frontend_net.cpp,v 1.10 2005-10-25 16:01:36 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -97,8 +97,8 @@ int main(int argc, char **argv)
 	    router.rule(filter_front);
 
             // put log filter in router
-            yp2::filter::Log filter_log;
-            router.rule(filter_log);
+            yp2::filter::Log filter_log_front("FRONT");
+            router.rule(filter_log_front);
 
             // put Virt db filter in router
             yp2::filter::Virt_db filter_virt_db;
@@ -106,6 +106,9 @@ int main(int argc, char **argv)
 
 	    router.rule(filter_virt_db);
 
+            yp2::filter::Log filter_log_back("BACK");
+            router.rule(filter_log_back);
+
             // put HTTP backend filter in router
             HTTPFilter filter_init;
 	    router.rule(filter_init);
diff --git a/src/filter_backend_test.cpp b/src/filter_backend_test.cpp
index 0a050ff..dda5135 100644
--- a/src/filter_backend_test.cpp
+++ b/src/filter_backend_test.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_backend_test.cpp,v 1.2 2005-10-25 15:19:39 adam Exp $
+/* $Id: filter_backend_test.cpp,v 1.3 2005-10-25 16:01:36 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -117,6 +117,9 @@ void yf::Backend_test::process(Package &package) const
         {
             apdu_res = zget_APDU(odr, Z_APDU_close);            
             *apdu_res->u.close->closeReason = Z_Close_protocolError;
+            apdu_res->u.close->diagnosticInformation =
+                odr_strdup(odr, "bad APDU in filter_backend_test");
+            
             package.session().close();
         }
         if (apdu_res)
diff --git a/src/filter_log.cpp b/src/filter_log.cpp
index 2cc54a4..1e21fb7 100644
--- a/src/filter_log.cpp
+++ b/src/filter_log.cpp
@@ -1,4 +1,4 @@
-/* $Id: filter_log.cpp,v 1.6 2005-10-25 11:48:30 adam Exp $
+/* $Id: filter_log.cpp,v 1.7 2005-10-25 16:01:36 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -21,6 +21,7 @@
 
 
 yp2::filter::Log::Log() {}
+yp2::filter::Log::Log(const std::string &msg) : m_msg(msg) {}
 
 void yp2::filter::Log::process(Package &package) const {
 
@@ -79,11 +80,6 @@ void yp2::filter::Log::process(Package &package) const {
     }
 }
 
-void yp2::filter::Log::set_prefix(const std::string &msg)
-{
-    m_msg = msg;
-}
-
 // defining and initializing static members
 boost::mutex yp2::filter::Log::m_log_mutex;
 
diff --git a/src/filter_log.hpp b/src/filter_log.hpp
index c8d3f85..e2af7c0 100644
--- a/src/filter_log.hpp
+++ b/src/filter_log.hpp
@@ -1,4 +1,4 @@
-/* $Id: filter_log.hpp,v 1.6 2005-10-25 11:48:30 adam Exp $
+/* $Id: filter_log.hpp,v 1.7 2005-10-25 16:01:36 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -19,9 +19,9 @@ namespace yp2 {
     namespace filter {
         class Log : public Base {
         public:
+            Log(const std::string &msg);
             Log();
             void process(yp2::Package & package) const;
-            void set_prefix(const std::string &msg);
         private:
             /// static mutex to lock Ostream during logging operation
             static boost::mutex m_log_mutex;
diff --git a/src/test_filter_virt_db.cpp b/src/test_filter_virt_db.cpp
index f62bb40..68056f2 100644
--- a/src/test_filter_virt_db.cpp
+++ b/src/test_filter_virt_db.cpp
@@ -1,4 +1,4 @@
-/* $Id: test_filter_virt_db.cpp,v 1.2 2005-10-25 11:48:30 adam Exp $
+/* $Id: test_filter_virt_db.cpp,v 1.3 2005-10-25 16:01:36 adam Exp $
    Copyright (c) 2005, Index Data.
 
 %LICENSE%
@@ -210,18 +210,16 @@ BOOST_AUTO_TEST_CASE( test_filter_virt_db_3 )
     {
         yp2::RouterChain router;
 
+        yp2::filter::Log filter_log1("FRONT");
 #if 0
-        yp2::filter::Log filter_log1;
-        filter_log1.set_prefix("FRONT");
         router.rule(filter_log1);
 #endif
    
         yp2::filter::Virt_db vdb;        
         router.rule(vdb);
         vdb.add_map_db2vhost("Default", "localhost:210");
+        yp2::filter::Log filter_log2("BACK");
 #if 0
-        yp2::filter::Log filter_log2;
-        filter_log2.set_prefix("BACK");
         router.rule(filter_log2);
 #endif
         yp2::filter::Backend_test btest;
-- 
1.7.10.4