X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FTarget.cc;h=01864ec65215595ce635b85179b1f036641b77c2;hb=82ad2ed94c12c3e53097fef92978de8c28239fab;hp=e6fdc0cbe678c0ac4df060110f5612406d1cdfa7;hpb=56ec4faa5dcae61746a78375cb7de605d0b79738;p=senf.git

diff --git a/Utils/Logger/Target.cc b/Utils/Logger/Target.cc
index e6fdc0c..01864ec 100644
--- a/Utils/Logger/Target.cc
+++ b/Utils/Logger/Target.cc
@@ -24,9 +24,10 @@
     \brief Target non-inline non-template implementation */
 
 #include "Target.hh"
-//#include "Target.ih"
+#include "Target.ih"
 
 // Custom includes
+#include <algorithm>
 
 //#include "Target.mpp"
 #define prefix_
@@ -37,7 +38,7 @@
 
 prefix_ senf::log::Target::Target()
 {
-    TargetRegistry::instance().registerTarget(this);
+    detail::TargetRegistry::instance().registerTarget(this);
 }
 
 prefix_ senf::log::Target::~Target()
@@ -48,7 +49,7 @@ prefix_ senf::log::Target::~Target()
         RIB::reverse_iterator i (rib_.rbegin());
         unroute(i->stream_, i->area_, i->level_, i->action_);
     }
-    TargetRegistry::instance().unregisterTarget(this);
+    detail::TargetRegistry::instance().unregisterTarget(this);
 }
 
 prefix_ void senf::log::Target::route(std::string const & stream, std::string const & area,
@@ -66,6 +67,21 @@ prefix_ void senf::log::Target::route(std::string const & stream, std::string co
     route(s, a, level, action, index);
 }
 
+prefix_ void senf::log::Target::unroute(std::string const & stream, std::string const & area,
+                                        unsigned level, action_t action)
+{
+    detail::StreamBase const * s (StreamRegistry::instance().lookup(stream));
+    if (!s)
+        throw InvalidStreamException();
+    detail::AreaBase const * a (0);
+    if (! area.empty()) {
+        a = AreaRegistry::instance().lookup(area);
+        if (!a)
+            throw InvalidAreaException();
+    }
+    unroute(s, a, level, action);
+}
+
 prefix_ void senf::log::Target::unroute(int index)
 {
     RIB::iterator i;
@@ -74,7 +90,7 @@ prefix_ void senf::log::Target::unroute(int index)
             i = rib_.begin();
         else {
             i = rib_.end();
-            std::advance(i, -index);
+            std::advance(i, index);
         }
     } else {
         if (RIB::size_type(index+1) >= rib_.size()) {
@@ -85,6 +101,8 @@ prefix_ void senf::log::Target::unroute(int index)
             std::advance(i, index);
         }
     }
+    if (i == rib_.end())
+        return;
     RoutingEntry entry (*i);
     rib_.erase(i);
     if (entry.action_ == ACCEPT)
@@ -104,7 +122,7 @@ prefix_ void senf::log::Target::route(detail::StreamBase const * stream,
             i = rib_.begin();
         else {
             i = rib_.end();
-            std::advance(i, -index - 1);
+            std::advance(i, index + 1 );
         }
     } else {
         if (RIB::size_type(index) >= rib_.size())
@@ -181,14 +199,18 @@ prefix_ void senf::log::Target::write(boost::posix_time::ptime timestamp,
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::log::TargetRegistry
+// senf::log::TimeSource
+
+prefix_ senf::log::TimeSource::~TimeSource()
+{}
+
+///////////////////////////////////////////////////////////////////////////
+// senf::log::SystemTimeSource
 
-prefix_ void senf::log::TargetRegistry::write(detail::StreamBase const & stream,
-                                              detail::AreaBase const & area, unsigned level,
-                                              std::string msg)
+prefix_ boost::posix_time::ptime senf::log::SystemTimeSource::operator()()
+    const
 {
-    boost::posix_time::ptime timestamp (boost::posix_time::microsec_clock::universal_time());
-    area.write(timestamp, stream, level, msg);
+    return boost::posix_time::microsec_clock::universal_time();
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////