X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Utils%2FLogger%2FFileTarget.cc;h=52ebaf82670003f024e0ea75c727ddbe5ca57e9a;hb=a22f6d21df6c911d65f76d7731bcf92b1906bb09;hp=c2538c4252757cc1efbb6db1d94e65f04f45465f;hpb=044a1bfb46ce16c3daac307b8c684604b43dd4cf;p=senf.git diff --git a/Utils/Logger/FileTarget.cc b/Utils/Logger/FileTarget.cc index c2538c4..52ebaf8 100644 --- a/Utils/Logger/FileTarget.cc +++ b/Utils/Logger/FileTarget.cc @@ -1,8 +1,8 @@ // $Id$ // -// Copyright (C) 2007 -// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS) -// Kompetenzzentrum fuer NETwork research (NET) +// Copyright (C) 2007 +// Fraunhofer Institute for Open Communication Systems (FOKUS) +// Competence Center NETwork research (NET), St. Augustin, GERMANY // Stefan Bund // // This program is free software; you can redistribute it and/or modify @@ -27,14 +27,26 @@ //#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) -{} +prefix_ senf::log::FileTarget::FileTarget(std::string const & file) + : ofstream_t(file.c_str(), std::ofstream::app), IOStreamTarget(file, ofstream_t::member), + file_(file) +{ + consoleDir().add( "reopen", senf::membind( + static_cast(&FileTarget::reopen), + this)) + .doc("Reopen logfile"); + consoleDir().add("reopen", senf::membind( + static_cast(&FileTarget::reopen), + this)) + .arg("filename","new filename") + .overloadDoc("Reopen logfile under new name"); +} prefix_ void senf::log::FileTarget::reopen() { @@ -42,10 +54,30 @@ 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."); +} + +prefix_ boost::shared_ptr +senf::log::FileTarget::RegisterConsole::create(std::string const & filename) +{ + std::auto_ptr tp (new FileTarget(filename)); + Target & target (*tp.get()); + detail::TargetRegistry::instance().dynamicTarget(tp); + return target.consoleDir().node().thisptr(); } ///////////////////////////////cc.e////////////////////////////////////////