X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FUtils%2FLogger%2FFileTarget.cc;h=4d95d01b298f78ac3977cde0f314ca8cefc6c715;hb=5b2e9a63a43027c71ac470ac9bdecb72e8974951;hp=e4bf38fd4540620ef41e7d0a09ede620f048ba05;hpb=21be434729b552e31b856b2f42fc978062d0dd55;p=senf.git

diff --git a/senf/Utils/Logger/FileTarget.cc b/senf/Utils/Logger/FileTarget.cc
index e4bf38f..4d95d01 100644
--- a/senf/Utils/Logger/FileTarget.cc
+++ b/senf/Utils/Logger/FileTarget.cc
@@ -27,16 +27,17 @@
 //#include "FileTarget.ih"
 
 // Custom includes
-#include <senf/Utils/Console/Console.hh>
-#include <senf/Utils/Exception.hh>
+#include <senf/Utils/Console/ParsedCommand.hh>
+#include <senf/Utils/Console/Variables.hh>
+#include <senf/Utils/Console/ScopedDirectory.hh>
 #include <boost/filesystem/path.hpp>
 
 //#include "FileTarget.mpp"
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
-    
+
     std::string getNodename(std::string const & filename, std::string const & nodename)
     {
         if (! nodename.empty())
@@ -48,21 +49,21 @@ namespace {
 
 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), 
+    : ofstream_t (filename.c_str(), std::ofstream::app),
+      IOStreamTarget (getNodename(filename, nodename), ofstream_t::member),
       file_ (filename)
 {
-    namespace fty = senf::console::factory;
+    namespace fty = console::factory;
 
     if (! ofstream_t::member)
         SENF_THROW_SYSTEM_EXCEPTION("logfile open") << ": " << filename;
     consoleDir()
         .add( "reopen",
-              fty::Command(this, SENF_MEMFNP(void, FileTarget, reopen, ()))
+              fty::Command(SENF_MEMBINDFNP(void, FileTarget, reopen, ()))
               .doc("Reopen logfile") );
     consoleDir()
-        .add("reopen", 
-             fty::Command(this, SENF_MEMFNP(void, FileTarget, reopen, (std::string const &)))
+        .add("reopen",
+             fty::Command(SENF_MEMBINDFNP(void, FileTarget, reopen, (std::string const &)))
              .arg("filename","new filename")
              .overloadDoc("Reopen logfile under new name") );
     consoleDir()
@@ -94,8 +95,8 @@ prefix_ std::string const & senf::log::FileTarget::filename()
 
 prefix_ senf::log::FileTarget::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("file-target", fty::Command(&RegisterConsole::create)
@@ -118,7 +119,7 @@ prefix_ senf::log::FileTarget::RegisterConsole::RegisterConsole()
 }
 
 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, nodename));
@@ -127,7 +128,7 @@ senf::log::FileTarget::RegisterConsole::create(std::string const & filename,
     return target.consoleDir().node().thisptr();
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 //#include "FileTarget.mpp"