X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FLogFormat.cc;h=b4d2d494bffae25c63c7df2eac331951ea7bb809;hb=5b2e9a63a43027c71ac470ac9bdecb72e8974951;hp=0f205a59c65e10d52b727de2ee5591feae53bafb;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/Utils/Logger/LogFormat.cc b/senf/Utils/Logger/LogFormat.cc
index 0f205a5..b4d2d49 100644
--- a/senf/Utils/Logger/LogFormat.cc
+++ b/senf/Utils/Logger/LogFormat.cc
@@ -1,6 +1,6 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
 // Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
@@ -32,11 +32,12 @@
 #include <locale>
 #include <boost/date_time/posix_time/posix_time.hpp>
 #include <senf/Scheduler/ClockService.hh>
-#include <senf/Utils/Console/Console.hh>
+#include <senf/Utils/Console/ScopedDirectory.hh>
+#include <senf/Utils/Console/ParsedCommand.hh>
 
 //#include "LogFormat.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ senf::log::detail::LogFormat::LogFormat()
     : tag_ (detail::getDefaultTag()), noformat_ (false), showTime_ (true),
@@ -49,41 +50,42 @@ prefix_ senf::log::detail::LogFormat::LogFormat(console::ScopedDirectory<> & dir
     : tag_ (detail::getDefaultTag()), noformat_ (false), showTime_ (true),
       showStream_ (false), showLevel_ (true), showArea_ (true), timeBase_ (-1)
 {
-    namespace kw = senf::console::kw;
+    namespace kw = console::kw;
+    namespace fty = console::factory;
 
     timeFormat("%Y-%m-%d %H:%M:%S.%f-0000");
 
-    dir.add("showTime", senf::membind(&LogFormat::showTime, this))
-        .arg("flag","whether to display the time in log messages",
-             kw::default_value = true)
-        .doc("Set time display in log messages. If time display is enabled, see the 'timeFormat'\n"
-             "command to set the time format.");
-    dir.add("showStream", senf::membind(&LogFormat::showStream, this))
-        .arg("flag","whether to display the stream in log messages",
-             kw::default_value = true)
-        .doc("Set strean display in log messages.");
-    dir.add("showLevel", senf::membind(&LogFormat::showLevel, this))
-        .arg("flag","whether to display the log level in log messages",
-             kw::default_value = true)
-        .doc("Set log level display in log messages.");
-    dir.add("showArea", senf::membind(&LogFormat::showArea, this))
-        .arg("flag","whether to display the area in log messages",
-             kw::default_value = true)
-        .doc("Set area display in log messages.");
-    dir.add("timeFormat", senf::membind(&LogFormat::timeFormat, this))
-        .arg("format","time format")
-        .doc("Set time format. The time format is specified using a format string. This format\n"
-             "string follows the strftime format.\n"
-             "\n"
-             "As additional option, the format string may be set to the empty string. In this\n"
-             "case the time will be displayed as 'second.nanosecond' value. IN this case, the\n"
-             "time is displayed relative to the first message after changing the format.");
-    dir.add("tag", senf::membind(&LogFormat::tag, this))
-        .arg("tag","log message tag prefix")
-        .doc("Every log message is optionally prefixed with a tag value. This value defaults to\n"
-             "the executable name and pid.");
-    dir.add("format", senf::membind(&LogFormat::consoleFormat, this))
-        .doc("Show the current log message format.");
+    dir.add("showTime", fty::Command(&LogFormat::showTime, this)
+            .arg("flag","whether to display the time in log messages",
+                 kw::default_value = true)
+            .doc("Set time display in log messages. If time display is enabled, see the 'timeFormat'\n"
+                 "command to set the time format.") );
+    dir.add("showStream", fty::Command(&LogFormat::showStream, this)
+            .arg("flag","whether to display the stream in log messages",
+                 kw::default_value = true)
+            .doc("Set strean display in log messages.") );
+    dir.add("showLevel", fty::Command(&LogFormat::showLevel, this)
+            .arg("flag","whether to display the log level in log messages",
+                 kw::default_value = true)
+            .doc("Set log level display in log messages.") );
+    dir.add("showArea", fty::Command(&LogFormat::showArea, this)
+            .arg("flag","whether to display the area in log messages",
+                 kw::default_value = true)
+            .doc("Set area display in log messages.") );
+    dir.add("timeFormat", fty::Command(&LogFormat::timeFormat, this)
+            .arg("format","time format")
+            .doc("Set time format. The time format is specified using a format string. This format\n"
+                 "string follows the strftime format.\n"
+                 "\n"
+                 "As additional option, the format string may be set to the empty string. In this\n"
+                 "case the time will be displayed as 'second.nanosecond' value. IN this case, the\n"
+                 "time is displayed relative to the first message after changing the format.") );
+    dir.add("tag", fty::Command(&LogFormat::tag, this)
+            .arg("tag","log message tag prefix")
+            .doc("Every log message is optionally prefixed with a tag value. This value defaults to\n"
+                 "the executable name and pid.") );
+    dir.add("format", fty::Command(&LogFormat::consoleFormat, this)
+            .doc("Show the current log message format.") );
 }
 
 prefix_ void senf::log::detail::LogFormat::consoleFormat(std::ostream & os)
@@ -129,7 +131,7 @@ prefix_ std::string senf::log::detail::LogFormat::prefix(time_type timestamp,
                         << std::setfill('0') << std::setw(9)
                         << (delta % 1000000000ll);
         }
-        else 
+        else
             datestream_ << senf::ClockService::abstime(timestamp);
         datestream_ << ' ';
     }
@@ -145,7 +147,7 @@ prefix_ std::string senf::log::detail::LogFormat::prefix(time_type timestamp,
     return datestream_.str();
 }
 
-///////////////////////////////////////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 prefix_ void senf::log::detail::quoteNonPrintable(std::string & s)
 {
@@ -161,7 +163,7 @@ prefix_ std::string senf::log::detail::getDefaultTag()
     return ss.str();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "LogFormat.mpp"