Utils/Termlib: Add some logging

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

diff --git a/Utils/Logger/FileTarget.cc b/Utils/Logger/FileTarget.cc
index 0467573..568cc9d 100644 (file)
--- a/Utils/Logger/FileTarget.cc
+++ b/Utils/Logger/FileTarget.cc
@@ -27,14 +27,39 @@
 //#include "FileTarget.ih"
 
 // Custom includes
+#include "../Console/Console.hh"
 
 //#include "FileTarget.mpp"
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
 
-prefix_ senf::log::FileTarget::FileTarget(std::string file)
-    : ofstream_t(file.c_str(), std::ofstream::app), IOStreamTarget(ofstream_t::member), file_(file)
-{}
+namespace {
+    
+    std::string quoteFilename(std::string filename)
+    {
+        for (std::string::iterator i (filename.begin()); i != filename.end(); ++i)
+            if (! senf::console::CommandParser::isWordChar(*i))
+                *i = '_';
+        return filename;
+    }
+
+}
+
+prefix_ senf::log::FileTarget::FileTarget(std::string const & file)
+    : ofstream_t(file.c_str(), std::ofstream::app), 
+      IOStreamTarget(quoteFilename(file), ofstream_t::member), 
+      file_(file)
+{
+    consoleDir().add( "reopen", senf::membind(
+                          static_cast<void (FileTarget::*)()>(&FileTarget::reopen),
+                          this))
+        .doc("Reopen logfile");
+    consoleDir().add("reopen", senf::membind(
+                         static_cast<void (FileTarget::*)(std::string const &)>(&FileTarget::reopen),
+                         this))
+        .arg("filename","new filename")
+        .overloadDoc("Reopen logfile under new name");
+}
 
 prefix_ void senf::log::FileTarget::reopen()
 {
@@ -42,10 +67,42 @@ prefix_ void senf::log::FileTarget::reopen()
     ofstream_t::member.open(file_.c_str(), std::ofstream::app);
 }
 
-prefix_ void senf::log::FileTarget::reopen(std::string file)
+prefix_ void senf::log::FileTarget::reopen(std::string const & file)
 {
     file_ = file;
     reopen();
+    // Rename console directory
+    console::DirectoryNode::ptr parent (consoleDir().node().parent());
+    if (parent)
+        parent->add(file, consoleDir().node().unlink());
+}
+
+prefix_ senf::log::FileTarget::RegisterConsole::RegisterConsole()
+{
+    detail::TargetRegistry::instance().consoleDir().add("file-target",&RegisterConsole::create)
+        .arg("filename", "name of logfile")
+        .doc("Create new file target. Examples:\n"
+             "\n"
+             "Create new file target '/var/log/example.log\n"
+             "    $ file-target \"/var/log/example.log\"\n"
+             "    <Directory '/sys/log/_var_log_example.log'>\n"
+             "\n"
+             "In a configuration file, create new file target '/var/log/example.log' and set\n"
+             "some parameters (If written on one line, this works at the console too:\n"
+             "    /sys/log/file-target \"/var/log/example.log\" {\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>
+senf::log::FileTarget::RegisterConsole::create(std::string const & filename)
+{
+    std::auto_ptr<Target> tp (new FileTarget(filename));
+    Target & target (*tp.get());
+    detail::TargetRegistry::instance().dynamicTarget(tp);
+    return target.consoleDir().node().thisptr();
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////