X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FIOStreamTarget.cc;h=73944557cfa761f96cdecc68b9964918be71aa4b;hb=9a074ebd4b82022bfe686b40de8db80927def2b8;hp=dbf4454fcfa6e77e512295ec39342fb6d29ecfc6;hpb=16a7043409c142f245eb5f55daa6cfafb84bbd06;p=senf.git diff --git a/Utils/Logger/IOStreamTarget.cc b/Utils/Logger/IOStreamTarget.cc index dbf4454..7394455 100644 --- a/Utils/Logger/IOStreamTarget.cc +++ b/Utils/Logger/IOStreamTarget.cc @@ -30,6 +30,7 @@ #include #include #include +#include //#include "IOStreamTarget.mpp" #define prefix_ @@ -38,7 +39,7 @@ /////////////////////////////////////////////////////////////////////////// // senf::log::IOStreamTarget -const char * const senf::log::IOStreamTarget::LEVELNAMES_[8] = { +char const * const senf::log::IOStreamTarget::LEVELNAMES_[8] = { "NONE", "VERBOSE", "NOTICE", "MESSAGE", "IMPORTANT", "CRITICAL", "FATAL", "DISABLED" }; prefix_ senf::log::IOStreamTarget::IOStreamTarget(std::ostream & os) @@ -53,7 +54,7 @@ prefix_ senf::log::IOStreamTarget::IOStreamTarget(std::ostream & os) //////////////////////////////////////// // 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) @@ -70,11 +71,11 @@ prefix_ void senf::log::IOStreamTarget::v_write(boost::posix_time::ptime timesta char sep (' '); for (; i != i_end; ++i) { - stream_ << timestamp << sep; + stream_ << senf::ClockService::abstime(timestamp) << sep; stream_ << "[" << LEVELNAMES_[level] << "]"; if (area != "senf::log::DefaultArea") - stream_ << "[" << area << "] "; - stream_ << *i << "\n"; + stream_ << " [" << area << "]"; + stream_ << " " << *i << "\n"; sep = '-'; } stream_ << std::flush;