Utils/Console: Fix DirectoryNode::add(...) API

[senf.git] / senf / Utils / Logger / LogFormat.cc

diff --git a/senf/Utils/Logger/LogFormat.cc b/senf/Utils/Logger/LogFormat.cc
index 0f205a5..4fc05f8 100644 (file)
--- a/senf/Utils/Logger/LogFormat.cc
+++ b/senf/Utils/Logger/LogFormat.cc
@@ -50,40 +50,41 @@ prefix_ senf::log::detail::LogFormat::LogFormat(console::ScopedDirectory<> & dir
       showStream_ (false), showLevel_ (true), showArea_ (true), timeBase_ (-1)
 {
     namespace kw = senf::console::kw;
+    namespace fty = senf::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::BoundCommand(this, &LogFormat::showTime)
+            .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::BoundCommand(this, &LogFormat::showStream)
+            .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::BoundCommand(this, &LogFormat::showLevel)
+            .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::BoundCommand(this, &LogFormat::showArea)
+            .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::BoundCommand(this, &LogFormat::timeFormat)
+            .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::BoundCommand(this, &LogFormat::tag)
+            .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::BoundCommand(this, &LogFormat::consoleFormat)
+            .doc("Show the current log message format.") );
 }
 
 prefix_ void senf::log::detail::LogFormat::consoleFormat(std::ostream & os)