X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FIOStreamTarget.cc;h=6441cf8581551b54c1d83e2a3c8f42fd61077f28;hb=a726ae0cb14d0ce37e5aab3c4e07121bbbd3b31c;hp=dbf4454fcfa6e77e512295ec39342fb6d29ecfc6;hpb=16a7043409c142f245eb5f55daa6cfafb84bbd06;p=senf.git

diff --git a/Utils/Logger/IOStreamTarget.cc b/Utils/Logger/IOStreamTarget.cc
index dbf4454..6441cf8 100644
--- a/Utils/Logger/IOStreamTarget.cc
+++ b/Utils/Logger/IOStreamTarget.cc
@@ -24,12 +24,16 @@
     \brief IOStreamTarget non-inline non-template implementation */
 
 #include "IOStreamTarget.hh"
-//#include "IOStreamTarget.ih"
+#include "IOStreamTarget.ih"
 
 // Custom includes
+#include <errno.h>
 #include <locale>
+#include <sstream>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/tokenizer.hpp>
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include "../Scheduler/ClockService.hh"
 
 //#include "IOStreamTarget.mpp"
 #define prefix_
@@ -38,46 +42,94 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::log::IOStreamTarget
 
-const char * const senf::log::IOStreamTarget::LEVELNAMES_[8] = {
-        "NONE", "VERBOSE", "NOTICE", "MESSAGE", "IMPORTANT", "CRITICAL", "FATAL", "DISABLED" };
-
 prefix_ senf::log::IOStreamTarget::IOStreamTarget(std::ostream & os)
-    : stream_(os)
+    : stream_ (os), tag_ (detail::getDefaultTag()), noformat_ (false), showTime_ (true),
+      showStream_ (false), showLevel_ (true), showArea_ (true), timeBase_ (-1)
 {
-    std::locale const & loc (stream_.getloc());
-    if (!std::has_facet<boost::posix_time::time_facet>(loc))
-        stream_.imbue( std::locale(
+    std::locale const & loc (datestream_.getloc());
+    datestream_.imbue( std::locale(
                            loc, new boost::posix_time::time_facet("%Y-%m-%d %H:%M:%S.%f-0000")) );
+    
+}
+
+prefix_ void senf::log::IOStreamTarget::timeFormat(std::string const & format)
+{
+    if (format.empty()) {
+        noformat_ = true;
+        timeBase_ = -1;
+    } else {
+        noformat_ = false;
+        std::locale const & loc (datestream_.getloc());
+        datestream_.imbue( std::locale(
+                               loc, new boost::posix_time::time_facet(format.c_str())) );
+    }
 }
 
 ////////////////////////////////////////
 // private members
 
-prefix_ void senf::log::IOStreamTarget::v_write(boost::posix_time::ptime timestamp,
+prefix_ void senf::log::IOStreamTarget::v_write(time_type timestamp,
                                                 std::string const & stream,
                                                 std::string const & area, unsigned level,
                                                 std::string const & message)
 {
-    std::string m (boost::trim_right_copy(message));
-
-    typedef boost::char_separator<char> Separator;
-    typedef boost::tokenizer<Separator> Tokenizer;
-    Separator separator ("\n");
-    Tokenizer tokenizer (m, separator);
-    Tokenizer::iterator i (tokenizer.begin());
-    Tokenizer::iterator const i_end (tokenizer.end());
-
-    char sep (' ');
-
-    for (; i != i_end; ++i) {
-        stream_ << timestamp << sep;
-        stream_ << "[" << LEVELNAMES_[level] << "]";
-        if (area != "senf::log::DefaultArea")
-            stream_ << "[" << area << "] ";
-        stream_ << *i << "\n";
-        sep = '-';
+    std::string m (message);
+    boost::trim_right(m);
+    detail::quoteNonPrintable(m);
+
+    if (tag_.empty() && !showTime_ && !showStream_ && !showLevel_ && !showArea_)
+        stream_ << m << std::endl;
+    else {
+        typedef boost::char_separator<char> Separator;
+        typedef boost::tokenizer<Separator> Tokenizer;
+        Separator separator ("\n");
+        Tokenizer tokenizer (m, separator);
+        Tokenizer::iterator i (tokenizer.begin());
+        Tokenizer::iterator const i_end (tokenizer.end());
+
+        if (showTime_) {
+            if (noformat_) {
+                if (timeBase_ == -1) timeBase_ = timestamp;
+                time_type delta (timestamp - timeBase_);
+                datestream_ << std::setfill('0') << std::setw(10)
+                            << (delta / 1000000000ll) << '.'
+                            << std::setfill('0') << std::setw(9)
+                            << (delta % 1000000000ll);
+            }
+            else 
+                datestream_ << senf::ClockService::abstime(timestamp);
+            datestream_ << ' ';
+        }
+        if (!tag_.empty())
+            datestream_ << tag_ << ": ";
+        if (showStream_)
+            datestream_ << '[' << stream << "] ";
+        if (showLevel_)
+            datestream_ << '[' << LEVELNAMES[level] << "] ";
+        if (showArea_ && area != "senf::log::DefaultArea")
+            datestream_ << '[' << area << "] ";
+
+        for (; i != i_end; ++i)
+            stream_ << datestream_.str() << *i << "\n";
+        stream_ << std::flush;
+        datestream_.str("");
     }
-    stream_ << std::flush;
+}
+
+///////////////////////////////////////////////////////////////////////////
+
+prefix_ void senf::log::detail::quoteNonPrintable(std::string & s)
+{
+    for (std::string::iterator i (s.begin()); i != s.end(); ++i)
+        if (*i < ' ' && *i != '\n')
+            *i = ' ';
+}
+
+prefix_ std::string senf::log::detail::getDefaultTag()
+{
+    std::stringstream ss;
+    ss << ::program_invocation_short_name << '[' << ::getpid() << ']';
+    return ss.str();
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////