X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FFileTarget.cc;h=c5aaa0343b06cef97476c17e7933f86e3350ae77;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=e15b3e8818541afe044cad79580964f3e2d06152;hpb=4195e3fc4bb545f2f7921396e2aec77edaa8c8c3;p=senf.git

diff --git a/Utils/Logger/FileTarget.cc b/Utils/Logger/FileTarget.cc
index e15b3e8..c5aaa03 100644
--- a/Utils/Logger/FileTarget.cc
+++ b/Utils/Logger/FileTarget.cc
@@ -28,6 +28,8 @@
 
 // Custom includes
 #include "../Console/Console.hh"
+#include "../Exception.hh"
+#include <boost/filesystem/path.hpp>
 
 //#include "FileTarget.mpp"
 #define prefix_
@@ -35,21 +37,23 @@
 
 namespace {
     
-    std::string quoteFilename(std::string filename)
+    std::string getNodename(std::string const & filename, std::string const & nodename)
     {
-        for (std::string::iterator i (filename.begin()); i != filename.end(); ++i)
-            if (! senf::console::CommandParser::isWordChar(*i))
-                *i = '_';
-        return filename;
+        if (! nodename.empty())
+            return nodename;
+        return boost::filesystem::path(filename).leaf();
     }
 
 }
 
-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)
+prefix_ senf::log::FileTarget::FileTarget(std::string const & filename,
+                                          std::string const & nodename)
+    : ofstream_t (filename.c_str(), std::ofstream::app), 
+      IOStreamTarget (getNodename(filename, nodename), ofstream_t::member), 
+      file_ (filename)
 {
+    if (! ofstream_t::member)
+        SENF_THROW_SYSTEM_EXCEPTION("logfile open") << ": " << filename;
     consoleDir().add( "reopen", senf::membind(
                           static_cast<void (FileTarget::*)()>(&FileTarget::reopen),
                           this))
@@ -59,6 +63,8 @@ prefix_ senf::log::FileTarget::FileTarget(std::string const & file)
                          this))
         .arg("filename","new filename")
         .overloadDoc("Reopen logfile under new name");
+    consoleDir().add("file", boost::cref(file_))
+        .doc("Show filename log messages are sent to");
 }
 
 prefix_ void senf::log::FileTarget::reopen()
@@ -77,17 +83,40 @@ prefix_ void senf::log::FileTarget::reopen(std::string const & file)
         parent->add(file, consoleDir().node().unlink());
 }
 
+prefix_ std::string const & senf::log::FileTarget::filename()
+    const
+{
+    return file_;
+}
+
 prefix_ senf::log::FileTarget::RegisterConsole::RegisterConsole()
 {
+    namespace kw = senf::console::kw;
+
     detail::TargetRegistry::instance().consoleDir().add("file-target",&RegisterConsole::create)
         .arg("filename", "name of logfile")
-        .doc("Create new file target.");
+        .arg("nodename", "name of node in console. Defaults to the files basename",
+             kw::default_value = "")
+        .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/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\" mainlog {\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)
+senf::log::FileTarget::RegisterConsole::create(std::string const & filename, 
+                                               std::string const & nodename)
 {
-    std::auto_ptr<Target> tp (new FileTarget(filename));
+    std::auto_ptr<Target> tp (new FileTarget(filename, nodename));
     Target & target (*tp.get());
     detail::TargetRegistry::instance().dynamicTarget(tp);
     return target.consoleDir().node().thisptr();