removed some useless spaces; not very important, I know :)

[senf.git] / Utils / Logger / Target.cc

diff --git a/Utils/Logger/Target.cc b/Utils/Logger/Target.cc
index e6fdc0c..f1dd507 100644 (file)
--- a/Utils/Logger/Target.cc
+++ b/Utils/Logger/Target.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
+// Copyright (C) 2007
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -24,9 +24,11 @@
     \brief Target non-inline non-template implementation */
 
 #include "Target.hh"
-//#include "Target.ih"
+#include "Target.ih"
 
 // Custom includes
+#include <algorithm>
+#include "ConsoleTarget.hh"
 
 //#include "Target.mpp"
 #define prefix_
@@ -37,7 +39,7 @@
 
 prefix_ senf::log::Target::Target()
 {
-    TargetRegistry::instance().registerTarget(this);
+    detail::TargetRegistry::instance().registerTarget(this);
 }
 
 prefix_ senf::log::Target::~Target()
@@ -48,7 +50,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 +68,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 +91,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 +102,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 +123,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())
@@ -117,6 +136,8 @@ prefix_ void senf::log::Target::route(detail::StreamBase const * stream,
     rib_.insert(i, RoutingEntry(stream, area, level, action));
     if (action == ACCEPT)
         updateRoutingCache(stream, area);
+    // This disables the initial fallback routing
+    detail::TargetRegistry::instance().routed();
 }
 
 prefix_ void senf::log::Target::unroute(detail::StreamBase const * stream,
@@ -181,14 +202,32 @@ prefix_ void senf::log::Target::write(boost::posix_time::ptime timestamp,
 }
 
 ///////////////////////////////////////////////////////////////////////////
-// senf::log::TargetRegistry
+// senf::log::detail::TargetRegistry
+
+prefix_ void senf::log::detail::TargetRegistry::write(StreamBase const & stream,
+                                                      AreaBase const & area, unsigned level,
+                                                      std::string msg)
+{
+    if (fallbackRouting_)
+        static_cast<Target &>(ConsoleTarget::instance()).v_write( 
+            (*timeSource_)(), stream.v_name(), area.v_name(), level, msg );
+    else
+        area.write( (*timeSource_)(), stream, level, msg );
+}
+
+///////////////////////////////////////////////////////////////////////////
+// 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////////////////////////////////////////