X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FTarget.cc;h=9c7968c9c7553c482e5d18a2c2f09cc1887e7f33;hb=9cb871b939efe93e35dd96808d25089399acfc46;hp=40af9e2e14f53af16ec6855ae6c3b5ac249513f4;hpb=3a43b572a2c0028b353d47e86fa7546633d6e2cf;p=senf.git diff --git a/senf/Utils/Logger/Target.cc b/senf/Utils/Logger/Target.cc index 40af9e2..9c7968c 100644 --- a/senf/Utils/Logger/Target.cc +++ b/senf/Utils/Logger/Target.cc @@ -48,7 +48,7 @@ namespace log { namespace detail { - SENF_CONSOLE_REGISTER_ENUM_MEMBER( TargetRegistry, Level, + SENF_CONSOLE_REGISTER_ENUM_MEMBER( TargetRegistry, Level, (VERBOSE)(NOTICE)(MESSAGE)(IMPORTANT)(CRITICAL)(FATAL) ); }}} @@ -329,15 +329,15 @@ namespace { prefix_ void senf::log::Target::consoleList(std::ostream & os) { - static char const * levels[] = { + static char const * levels[] = { "verbose", "verbose", "notice", "message", "important", "critical", "fatal", "disabled" }; boost::format fmt ("%2d %-29s %-29s %-9s %-6s\n"); os << fmt % "#" % "STREAM" % "AREA" % "LEVEL" % "ACTION"; unsigned n (0); for (iterator i (begin()); i != end(); ++i, ++n) - os << fmt - % n + os << fmt + % n % formatLabel(i->stream()) % formatLabel(i->area()) % levels[i->level()] @@ -470,7 +470,7 @@ prefix_ boost::shared_ptr senf::log::detail::TargetRegistry::consoleSelf(std::ostream & os) { return senf::console::Client::get(os).consoleDir().node().thisptr(); -} +} /////////////////////////////////////////////////////////////////////////// // senf::log::detail::LogParameters @@ -514,7 +514,7 @@ prefix_ std::ostream & senf::log::operator<<(std::ostream & os, senf::log::Targe namespace { - char const * levelNames[] = { + char const * levelNames[] = { "NONE", "VERBOSE", "NOTICE", "MESSAGE", "IMPORTANT", "CRITICAL", "FATAL", "DISABLED" }; void parseParamToken(std::string const & value, senf::log::detail::LogParameters & out) @@ -536,7 +536,7 @@ namespace { out.area = a; return; } - + char const ** i ( std::find(levelNames+1, levelNames+sizeof(levelNames)/sizeof(levelNames[0])-1, value)); if (i == levelNames+sizeof(levelNames)/sizeof(levelNames[0])-1) @@ -569,7 +569,7 @@ senf_console_parse_argument(console::ParseCommandInfo::TokensRange const & token LogParameters & out) { out.clear(); - + for (console::ParseCommandInfo::TokensRange::iterator i (tokens.begin()); i != tokens.end(); ++i) parseParamToken(i->value(), out);