X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FSyslogTarget.cc;h=0e42f5a6f6e4bcc7f32e001104897edce4021535;hb=ab7ff164ab5ae711ec09ce2b24228510f1ffdcff;hp=b4ba15d7f166da185ac9be6c0ed73cbbdef113c0;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Utils/Logger/SyslogTarget.cc b/senf/Utils/Logger/SyslogTarget.cc
index b4ba15d..0e42f5a 100644
--- a/senf/Utils/Logger/SyslogTarget.cc
+++ b/senf/Utils/Logger/SyslogTarget.cc
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // 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
-// 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 <g0dil@berlios.de>
 
 /** \file
     \brief SyslogTarget non-inline non-template implementation */
@@ -27,11 +32,13 @@
 //#include "SyslogTarget.ih"
 
 // Custom includes
-#include "../Console/Console.hh"
+#include <senf/Utils/Console/ParsedCommand.hh>
+#include <senf/Utils/Console/Traits.hh>
+#include <senf/Utils/Console/ScopedDirectory.hh>
 
 //#include "SyslogTarget.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 int const senf::log::SyslogTarget::LEVELMAP[8] = {
     0, LOG_DEBUG, LOG_INFO, LOG_NOTICE, LOG_WARNING, LOG_CRIT, LOG_EMERG, 0 };
@@ -58,26 +65,28 @@ namespace log {
 
 prefix_ senf::log::SyslogTarget::RegisterConsole::RegisterConsole()
 {
-    namespace kw = senf::console::kw;
+    namespace kw = console::kw;
+    namespace fty = console::factory;
 
-    detail::TargetRegistry::instance().consoleDir().add("syslog-target",&RegisterConsole::create)
-        .arg("facility", "syslog facility to send messages to. One of\n"
-             "                  AUTHPRIV CRON DAEMON FTP KERN LPR MAIL NEWS SYSLOG USER\n"
-             "                  UUCP LOCAL0 LOCAL1 LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7",
-             kw::default_value = USER)
-        .doc("Create new syslog target. Examples:\n"
-             "\n"
-             "Create new syslog target\n"
-             "    $ syslog-target\n"
-             "    <Directory '/sys/log/syslog'>\n"
-             "\n"
-             "In a configuration file, create new syslog target and set some parameters (If\n"
-             "written on one line, this works at the console too:\n"
-             "    /sys/log/syslog-target LOCAL2 {\n"
-             "        route (IMPORTANT);             # route all important messages\n"
-             "        timeFormat \"\";               # use non-formatted time format\n"
-             "        showArea false;                # don't show log area\n"
-             "    }\n");
+    detail::TargetRegistry::instance().consoleDir()
+        .add("syslog-target",fty::Command(&RegisterConsole::create)
+             .arg("facility", "syslog facility to send messages to. One of\n"
+                  "                  AUTHPRIV CRON DAEMON FTP KERN LPR MAIL NEWS SYSLOG USER\n"
+                  "                  UUCP LOCAL0 LOCAL1 LOCAL2 LOCAL3 LOCAL4 LOCAL5 LOCAL6 LOCAL7",
+                  kw::default_value = USER)
+             .doc("Create new syslog target. Examples:\n"
+                  "\n"
+                  "Create new syslog target\n"
+                  "    $ syslog-target\n"
+                  "    <Directory '/sys/log/syslog'>\n"
+                  "\n"
+                  "In a configuration file, create new syslog target and set some parameters (If\n"
+                  "written on one line, this works at the console too:\n"
+                  "    /sys/log/syslog-target LOCAL2 {\n"
+                  "        route (IMPORTANT);             # route all important messages\n"
+                  "        timeFormat \"\";               # use non-formatted time format\n"
+                  "        showArea false;                # don't show log area\n"
+                  "    }\n") );
 }
 
 prefix_ boost::shared_ptr<senf::console::DirectoryNode>
@@ -89,7 +98,7 @@ senf::log::SyslogTarget::RegisterConsole::create(LogFacility facility)
     return target.consoleDir().node().thisptr();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "SyslogTarget.mpp"