X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FIOStreamTarget.cc;h=b020e34b32344d66321aa94ecbe1ec3638e62f42;hb=81f84badf27b66dbadec9890646ca1193e998505;hp=fd1260c422f97d04f1ddd7320785a92fa5f7fd06;hpb=f73fa16ed5abdce272ac77f8b8b9ef2b9922c266;p=senf.git

diff --git a/Utils/Logger/IOStreamTarget.cc b/Utils/Logger/IOStreamTarget.cc
index fd1260c..b020e34 100644
--- a/Utils/Logger/IOStreamTarget.cc
+++ b/Utils/Logger/IOStreamTarget.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
-// Copyright (C) 2007 
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// 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
@@ -28,6 +28,7 @@
 
 // Custom includes
 #include <locale>
+#include <sstream>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/tokenizer.hpp>
 
@@ -38,42 +39,31 @@
 ///////////////////////////////////////////////////////////////////////////
 // senf::log::IOStreamTarget
 
-prefix_ senf::log::IOStreamTarget::IOStreamTarget(std::ostream & os)
-    : stream_(os)
-{
-    std::locale const & loc (stream_.getloc());
-    if (!std::has_facet<boost::posix_time::time_facet>(loc))
-        stream_.imbue( std::locale(
-                           loc, new boost::posix_time::time_facet("%Y-%m-%d %H:%M:%S.%f-0000")) );
-}
-
-////////////////////////////////////////
-// 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));
+    std::string m (message);
+    boost::trim_right(m);
+    detail::quoteNonPrintable(m);
 
-    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 (isPlainFormat())
+        stream_ << m << std::endl;
+    else {
+        std::string const & prf (prefix(timestamp, stream, area, level));
 
-    char sep (' ');
+        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());
 
-    for (; i != i_end; ++i) {
-        stream_ << timestamp << sep;
-        if (area != "senf::log::DefaultArea")
-            stream_ << "[" << area << "] ";
-        stream_ << *i << "\n";
-        sep = '-';
+        for (; i != i_end; ++i)
+            stream_ << prf << *i << "\n";
+        stream_ << std::flush;
     }
-    stream_ << std::flush;
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////