X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FTarget.cc;h=9c883dc979c2758bc9acc5b00548dab7e94a82c6;hb=61dc3812717cdc89fa2402006d4009236b72dc8f;hp=16b00ff293044966af693f9d07b7a65e377b2b9c;hpb=383bdfaf22128c50ffa5c692e7f5242b110c0183;p=senf.git diff --git a/Utils/Logger/Target.cc b/Utils/Logger/Target.cc index 16b00ff..9c883dc 100644 --- a/Utils/Logger/Target.cc +++ b/Utils/Logger/Target.cc @@ -272,6 +272,9 @@ prefix_ void senf::log::Target::updateRoutingCache(detail::StreamBase const * st updateRoutingCache(stream, i->second); return; } + if (! area->alive()) + // We are globally destructing and the area is gone already ... + return; unsigned limit (DISABLED::value); RIB::iterator i (rib_.begin()); RIB::iterator const i_end (rib_.end()); @@ -310,7 +313,7 @@ namespace { std::string formatLabel(std::string const & l) { if (l.empty()) - return "-"; + return "*"; if (l.size() > 29) return l.substr(l.size()-29); return l; @@ -320,7 +323,7 @@ namespace { prefix_ void senf::log::Target::consoleList(std::ostream & os) { static char const * levels[] = { - "none", "verbose", "notice", "message", "important", "critical", "fatal", "disabled" }; + "verbose", "verbose", "notice", "message", "important", "critical", "fatal", "disabled" }; boost::format fmt ("%2d %-29s %-29s %-9s %-6s\n"); os << fmt % "#" % "STREAM" % "AREA" % "LEVEL" % "ACTION"; @@ -415,7 +418,7 @@ prefix_ senf::log::detail::TargetRegistry::TargetRegistry() " \n" "\n" "Route all messages to the currently connected client\n" - " $ /sys/log/self { route (); }"); + " $ /sys/log/self { route (); }"); } prefix_ senf::log::detail::TargetRegistry::~TargetRegistry()