X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FTarget.cc;h=fc983ecf90fd7f08492f60863b22f2f667633223;hb=0003d55730b447329342161d12cf2ed23b63459e;hp=4b98e727c3de8b55de435aed3089bc9cc7b7fb6a;hpb=d9daeee4efbcb7776a14de22e090400a543e0f83;p=senf.git diff --git a/senf/Utils/Logger/Target.cc b/senf/Utils/Logger/Target.cc index 4b98e72..fc983ec 100644 --- a/senf/Utils/Logger/Target.cc +++ b/senf/Utils/Logger/Target.cc @@ -2,23 +2,28 @@ // // Copyright (C) 2007 // Fraunhofer Institute for Open Communication Systems (FOKUS) -// Competence Center NETwork research (NET), St. Augustin, GERMANY -// Stefan Bund // -// This program is free software; you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation; either version 2 of the License, or -// (at your option) any later version. +// The contents of this file are subject to the Fraunhofer FOKUS Public License +// Version 1.0 (the "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// http://senf.berlios.de/license.html // -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. +// The Fraunhofer FOKUS Public License Version 1.0 is based on, +// but modifies the Mozilla Public License Version 1.1. +// See the full license text for the amendments. // -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the -// Free Software Foundation, Inc., -// 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +// Software distributed under the License is distributed on an "AS IS" basis, +// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License +// for the specific language governing rights and limitations under the License. +// +// The Original Code is Fraunhofer FOKUS code. +// +// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. +// (registered association), Hansastraße 27 c, 80686 Munich, Germany. +// All Rights Reserved. +// +// Contributor(s): +// Stefan Bund /** \file \brief Target non-inline non-template implementation */ @@ -31,14 +36,12 @@ #include #include "ConsoleTarget.hh" #include -#include -#include //#include "Target.mpp" #define prefix_ -///////////////////////////////cc.p//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::log::Target namespace senf { @@ -55,8 +58,8 @@ namespace detail { prefix_ senf::log::Target::Target(std::string const & name) { - namespace kw = senf::console::kw; - namespace fty = senf::console::factory; + namespace kw = console::kw; + namespace fty = console::factory; detail::TargetRegistry::instance().registerTarget(this, name); consoleDir_() @@ -77,7 +80,7 @@ prefix_ senf::log::Target::Target(std::string const & name) .add("route", fty::Command(&Target::consoleRoute, this) .arg("index", "index at which to insert new rule") .arg("parameters", "log parameters. The log parameters select the log stream, log area\n" - " and log level. You may specify any combination of these parameterse\n" + " and log level. You may specify any combination of these parameters\n" " in any order. Use the '/sys/log/stream' and '/sys/log/areas' commands\n" " to list all valid streams and areas. Valid log levels are:\n" " VERBOSE NOTICE MESSAGE IMPORTANT CRITICAL FATAL") @@ -217,7 +220,7 @@ prefix_ void senf::log::Target::flush() updateRoutingCache(i->stream_, i->area_); } -//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // protected members prefix_ senf::console::ScopedDirectory<> & senf::log::Target::consoleDir() @@ -225,7 +228,7 @@ prefix_ senf::console::ScopedDirectory<> & senf::log::Target::consoleDir() return consoleDir_(); } -//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // private members prefix_ void senf::log::Target::route(detail::StreamBase const * stream, @@ -288,7 +291,7 @@ prefix_ void senf::log::Target::updateRoutingCache(detail::StreamBase const * st unsigned limit (DISABLED::value); RIB::iterator i (rib_.begin()); RIB::iterator const i_end (rib_.end()); - for(; i != i_end; ++i) + for (; i != i_end; ++i) if ( (! i->stream_ || i->stream_ == stream) && (! i->area_ || i->area_ == area) && i->action_ == ACCEPT ) { @@ -361,12 +364,12 @@ prefix_ void senf::log::Target::consoleUnroute(detail::LogParameters const & pm, unroute(pm.stream, pm.area, pm.level, action); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::log::detail::TargetRegistry prefix_ void senf::log::detail::TargetRegistry::dynamicTarget(std::auto_ptr target) { - namespace fty = senf::console::factory; + namespace fty = console::factory; target->consoleDir() .add("remove", fty::Command( @@ -404,8 +407,8 @@ prefix_ void senf::log::detail::TargetRegistry::consoleRemoveTarget(Target * tar prefix_ senf::log::detail::TargetRegistry::TargetRegistry() : fallbackRouting_(true) { - namespace kw = senf::console::kw; - namespace fty = senf::console::factory; + namespace kw = console::kw; + namespace fty = console::factory; console::sysdir().add("log", consoleDir_()); consoleDir_() @@ -417,7 +420,7 @@ prefix_ senf::log::detail::TargetRegistry::TargetRegistry() consoleDir_() .add("message", fty::Command(&TargetRegistry::consoleWrite, this) .arg("parameters", "log parameters. The log parameters select the log stream, log area\n" - " and log level. You may specify any combination of these parameterse\n" + " and log level. You may specify any combination of these parameters\n" " in any order. Use the '/sys/log/stream' and '/sys/log/areas' commands\n" " to list all valid streams and areas. Valid log levels are:\n" " VERBOSE NOTICE MESSAGE IMPORTANT CRITICAL FATAL", @@ -481,7 +484,7 @@ senf::log::detail::TargetRegistry::consoleSelf(std::ostream & os) return senf::console::Client::get(os).consoleDir().node().thisptr(); } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // senf::log::detail::LogParameters prefix_ void senf::log::detail::LogParameters::clear() @@ -501,8 +504,7 @@ prefix_ void senf::log::detail::LogParameters::setDefaults() level = MESSAGE::value; } -prefix_ senf::log::detail::LogParameters::LogParameters -senf::log::detail::LogParameters::defaultParameters() +prefix_ senf::log::detail::LogParameters senf::log::detail::LogParameters::defaultParameters() { LogParameters pm; pm.clear(); @@ -510,7 +512,7 @@ senf::log::detail::LogParameters::defaultParameters() return pm; } -/////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // namespace members prefix_ std::ostream & senf::log::operator<<(std::ostream & os, senf::log::Target::action_t const & action) @@ -581,7 +583,7 @@ senf_console_parse_argument(console::ParseCommandInfo::TokensRange const & token parseParamToken(i->value(), out); } -////////////////////////////////////////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// // I need to put this here, otherwise the file target will not be registered // if it is not used ... :-( @@ -589,7 +591,7 @@ senf::log::FileTarget::RegisterConsole senf::log::FileTarget::RegisterConsole::i senf::log::SyslogTarget::RegisterConsole senf::log::SyslogTarget::RegisterConsole::instance; senf::log::SyslogUDPTarget::RegisterConsole senf::log::SyslogUDPTarget::RegisterConsole::instance; -///////////////////////////////cc.e//////////////////////////////////////// +//-///////////////////////////////////////////////////////////////////////////////////////////////// #undef prefix_ //#include "Target.mpp"