X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FSyslogUDPTarget.cc;h=77fbcad47dd35f499fa3e09137404375e70673bc;hb=5b2e9a63a43027c71ac470ac9bdecb72e8974951;hp=28eccd090e6838a8fb1fcf6c9d66ac8f22ad50a4;hpb=fde4399789762f8257f7361761bd1a798068e717;p=senf.git

diff --git a/senf/Utils/Logger/SyslogUDPTarget.cc b/senf/Utils/Logger/SyslogUDPTarget.cc
index 28eccd0..77fbcad 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,16 +30,18 @@
 #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()
 {
-    namespace kw = senf::console::kw;
-    namespace fty = senf::console::factory;
+    namespace kw = console::kw;
+    namespace fty = console::factory;
 
     consoleDir().remove("format");
     consoleDir()
@@ -69,7 +71,7 @@ prefix_ void senf::log::SyslogUDPTarget::v_write(time_type timestamp, std::strin
     // or message will not inadvertently be interpreted as date or hostname by a receiving syslog
     // daemon or proxy
     if (syslogFormat_)
-        prfstream << '<' << (facility_ | senf::log::SyslogTarget::LEVELMAP[level]) << "> ";
+        prfstream << '<' << (facility_ | SyslogTarget::LEVELMAP[level]) << "> ";
     prfstream << prefix(timestamp, stream, area, level);
     std::string const & prf (prfstream.str());
 
@@ -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);
@@ -108,12 +110,12 @@ namespace log {
 
 prefix_ senf::log::SyslogUDPTarget::RegisterConsole::RegisterConsole()
 {
-    namespace kw = senf::console::kw;
-    namespace fty = senf::console::factory;
+    namespace kw = console::kw;
+    namespace fty = console::factory;
 
     detail::TargetRegistry::instance().consoleDir()
-        .add("udp-target", 
-             fty::Command<senf::console::DirectoryNode::ptr (*)(INet4SocketAddress const &, 
+        .add("udp-target",
+             fty::Command<console::DirectoryNode::ptr (*)(INet4SocketAddress const &,
                                                                 LogFacility)
              >(&RegisterConsole::create)
              .arg("address", "target address to send log messages to")
@@ -137,30 +139,27 @@ 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 &, 
-                                                                LogFacility)
+        .add("udp-target",
+             fty::Command<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 &, 
-                                                                LogFacility)
+        .add("udp-target",
+             fty::Command<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 &, 
-                                                                LogFacility)
+        .add("udp-target",
+             fty::Command<console::DirectoryNode::ptr (*)(INet6Address const &, LogFacility)
              >(&RegisterConsole::create)
              .arg("address")
              .arg("facility", kw::default_value = USER) );
 }
 
 prefix_ boost::shared_ptr<senf::console::DirectoryNode>
-senf::log::SyslogUDPTarget::RegisterConsole::create(senf::INet4SocketAddress const & target,
+senf::log::SyslogUDPTarget::RegisterConsole::create(INet4SocketAddress const & target,
                                                     LogFacility facility)
 {
     std::auto_ptr<Target> tp (new SyslogUDPTarget(target, facility));
@@ -170,7 +169,7 @@ senf::log::SyslogUDPTarget::RegisterConsole::create(senf::INet4SocketAddress con
 }
 
 prefix_ boost::shared_ptr<senf::console::DirectoryNode>
-senf::log::SyslogUDPTarget::RegisterConsole::create(senf::INet4Address const & target,
+senf::log::SyslogUDPTarget::RegisterConsole::create(INet4Address const & target,
                                                     LogFacility facility)
 {
     std::auto_ptr<Target> tp (new SyslogUDPTarget(target, facility));
@@ -180,7 +179,7 @@ senf::log::SyslogUDPTarget::RegisterConsole::create(senf::INet4Address const & t
 }
 
 prefix_ boost::shared_ptr<senf::console::DirectoryNode>
-senf::log::SyslogUDPTarget::RegisterConsole::create(senf::INet6SocketAddress const & target,
+senf::log::SyslogUDPTarget::RegisterConsole::create(INet6SocketAddress const & target,
                                                     LogFacility facility)
 {
     std::auto_ptr<Target> tp (new SyslogUDPTarget(target, facility));
@@ -190,7 +189,7 @@ senf::log::SyslogUDPTarget::RegisterConsole::create(senf::INet6SocketAddress con
 }
 
 prefix_ boost::shared_ptr<senf::console::DirectoryNode>
-senf::log::SyslogUDPTarget::RegisterConsole::create(senf::INet6Address const & target,
+senf::log::SyslogUDPTarget::RegisterConsole::create(INet6Address const & target,
                                                     LogFacility facility)
 {
     std::auto_ptr<Target> tp (new SyslogUDPTarget(target, facility));
@@ -199,7 +198,7 @@ senf::log::SyslogUDPTarget::RegisterConsole::create(senf::INet6Address const & t
     return tg.consoleDir().node().thisptr();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "SyslogUDPTarget.mpp"