X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FSyslogUDPTarget.cc;h=bd7ed8fd3461218a353850704103a6339a95def7;hb=93d9568d448749dc187e7622b733a4a3caa319df;hp=b5a04e50dd6703ebef5662e71b971035f3661d52;hpb=21be434729b552e31b856b2f42fc978062d0dd55;p=senf.git

diff --git a/senf/Utils/Logger/SyslogUDPTarget.cc b/senf/Utils/Logger/SyslogUDPTarget.cc
index b5a04e5..bd7ed8f 100644
--- a/senf/Utils/Logger/SyslogUDPTarget.cc
+++ b/senf/Utils/Logger/SyslogUDPTarget.cc
@@ -1,6 +1,6 @@
 // $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>
@@ -30,11 +30,13 @@
 #include <sstream>
 #include <boost/algorithm/string/trim.hpp>
 #include <boost/tokenizer.hpp>
-#include <senf/Utils/Console/Console.hh>
+#include <senf/Utils/Console/ParsedCommand.hh>
+#include <senf/Utils/Console/Traits.hh>
+#include <senf/Utils/Console/ScopedDirectory.hh>
 
 //#include "SyslogUDPTarget.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ void senf::log::SyslogUDPTarget::init()
 {
@@ -43,10 +45,10 @@ prefix_ void senf::log::SyslogUDPTarget::init()
 
     consoleDir().remove("format");
     consoleDir()
-        .add("format", fty::Command(this, &SyslogUDPTarget::consoleFormat)
+        .add("format", fty::Command(&SyslogUDPTarget::consoleFormat, this)
              .doc("Show the current log message format.") );
     consoleDir()
-        .add("syslog", fty::Command(this, SENF_MEMFNP(void, SyslogUDPTarget, syslog, (bool)))
+        .add("syslog", fty::Command(SENF_MEMBINDFNP(void, SyslogUDPTarget, syslog, (bool)))
              .arg("flag","new syslog format state",
                   kw::default_value=true)
              .doc("Change the syslog format flag. By default, syslog formating is enabled. In this\n"
@@ -82,7 +84,7 @@ prefix_ void senf::log::SyslogUDPTarget::v_write(time_type timestamp, std::strin
 
     std::string line;
     unsigned sz (896-prf.size());
-    for (; i != i_end; ++i) 
+    for (; i != i_end; ++i)
         for (unsigned j (0); j < i->size(); j += sz) {
             line = prf;
             line += std::string(*i, j, sz);
@@ -112,8 +114,8 @@ prefix_ senf::log::SyslogUDPTarget::RegisterConsole::RegisterConsole()
     namespace fty = senf::console::factory;
 
     detail::TargetRegistry::instance().consoleDir()
-        .add("udp-target", 
-             fty::Command<senf::console::DirectoryNode::ptr (*)(INet4SocketAddress const &, 
+        .add("udp-target",
+             fty::Command<senf::console::DirectoryNode::ptr (*)(INet4SocketAddress const &,
                                                                 LogFacility)
              >(&RegisterConsole::create)
              .arg("address", "target address to send log messages to")
@@ -137,22 +139,22 @@ prefix_ senf::log::SyslogUDPTarget::RegisterConsole::RegisterConsole()
                   "        syslog false;                  # no syslog format, just plain udp\n"
                   "    }\n") );
     detail::TargetRegistry::instance().consoleDir()
-        .add("udp-target", 
-             fty::Command<senf::console::DirectoryNode::ptr (*)(INet4Address const &, 
+        .add("udp-target",
+             fty::Command<senf::console::DirectoryNode::ptr (*)(INet4Address const &,
                                                                 LogFacility)
              >(&RegisterConsole::create)
              .arg("address")
              .arg("facility", kw::default_value = USER) );
     detail::TargetRegistry::instance().consoleDir()
-        .add("udp-target", 
-             fty::Command<senf::console::DirectoryNode::ptr (*)(INet6SocketAddress const &, 
+        .add("udp-target",
+             fty::Command<senf::console::DirectoryNode::ptr (*)(INet6SocketAddress const &,
                                                                 LogFacility)
              >(&RegisterConsole::create)
              .arg("address")
              .arg("facility", kw::default_value = USER) );
     detail::TargetRegistry::instance().consoleDir()
-        .add("udp-target", 
-             fty::Command<senf::console::DirectoryNode::ptr (*)(INet6Address const &, 
+        .add("udp-target",
+             fty::Command<senf::console::DirectoryNode::ptr (*)(INet6Address const &,
                                                                 LogFacility)
              >(&RegisterConsole::create)
              .arg("address")
@@ -199,7 +201,7 @@ senf::log::SyslogUDPTarget::RegisterConsole::create(senf::INet6Address const & t
     return tg.consoleDir().node().thisptr();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "SyslogUDPTarget.mpp"