added possibility to open files and close them automatically

eo/src/utils/eoLogger.cpp

@@ -47,9 +47,6 @@ Caner Candan <caner.candan@thalesgroup.com>
 
 void eoLogger::_init()
 {
-    _standard_io_streams[&std::cout] = 1;
-    _standard_io_streams[&std::clog] = 2;
-    _standard_io_streams[&std::cerr] = 2;
 
     // /!\ If you want to add a level dont forget to add it at the header file in the enumerator Levels
 
@@ -61,7 +58,6 @@ void eoLogger::_init()
     addLevel("debug", eo::debug);
     addLevel("xdebug", eo::xdebug);
 
-    //outStream = &std::cout;
 }
 
 eoLogger::eoLogger() :
@@ -78,27 +74,13 @@ eoLogger::eoLogger() :
     std::ostream::init(&_obuf);
     _init();
 }
-/*
-eoLogger::eoLogger(eo::file file) :
-    std::ostream(NULL),
-
-    _verbose("quiet", "verbose", "Set the verbose level", 'v'),
-    _printVerboseLevels(false, "print-verbose-levels", "Print verbose levels", 'l'),
-    _output("", "output", "Redirect a standard output to a file", 'o'),
-
-    _selectedLevel(eo::progress),
-    _contextLevel(eo::quiet),
-    _fd(2),
-    _obuf(_fd, _contextLevel, _selectedLevel)
-{
-    std::ostream::init(&_obuf);
-    _init();
-    *this << file;
-}*/
 
 eoLogger::~eoLogger()
 {
-    //if (_fd > 2) { ::close(_fd); }
+	//redirect(NULL);
+	if (_obuf._ownedFileStream != NULL) {
+		delete _obuf._ownedFileStream;
+	}
 }
 
 void eoLogger::_createParameters( eoParser& parser )
@@ -116,22 +98,21 @@ void eoLogger::_createParameters( eoParser& parser )
 
 
     //------------------------------------------------------------------
-    // we're gonna redirect the log to the given filename if -o is used.
+    // we redirect the log to the given filename if -o is used.
     //------------------------------------------------------------------
-/*
+
     if ( ! _output.value().empty() )
         {
-            eo::log << eo::file( _output.value() );
+    		redirect(_output.value());
         }
-*/
+
-// TODO with a stream
 
 
     //------------------------------------------------------------------
 
 
     //------------------------------------------------------------------
-    // we're gonna print the list of levels if -l parameter is used.
+    // we print the list of levels if -l parameter is used.
     //------------------------------------------------------------------
 
     if ( _printVerboseLevels.value() )
@@ -171,12 +152,6 @@ eoLogger& operator<<(eoLogger& l, const eo::Levels lvl)
     l._contextLevel = lvl;
     return l;
 }
-/*
-eoLogger& operator<<(eoLogger& l, eo::file f)
-{
-    l._fd = ::open(f._f.c_str(), O_WRONLY | O_APPEND | O_CREAT, 0644);
-    return l;
-}*/
 
 eoLogger& operator<<(eoLogger& l, eo::setlevel v)
 {
@@ -186,35 +161,49 @@ eoLogger& operator<<(eoLogger& l, eo::setlevel v)
 
 eoLogger& operator<<(eoLogger& l, std::ostream& os)
 {
-/*
+    l._obuf._outStream = &os;
-    if (l._standard_io_streams.find(&os) != l._standard_io_streams.end())
-        {
-            l._fd = l._standard_io_streams[&os];
-        }
-*/
-    l._obuf.outStream = &os;
     return l;
 }
 
-void eoLogger::redirectTo(std::ostream& os)
+void eoLogger::redirect(std::ostream& os)
 {
-    _obuf.outStream = &os;
+	if (_obuf._ownedFileStream != NULL) {
+		delete _obuf._ownedFileStream;
+		_obuf._ownedFileStream = NULL;
+	}
+    _obuf._outStream = &os;
+}
+
+void eoLogger::redirect(const char * filename)
+{
+	std::ofstream * os;
+	if (filename == NULL) {
+		os = NULL;
+	} else {
+		os = new std::ofstream(filename);
+	}
+	redirect(*os);
+	_obuf._ownedFileStream = os;
+}
+
+void eoLogger::redirect(const std::string& filename)
+{
+	redirect(filename.c_str());
 }
 
 
 eoLogger::outbuf::outbuf(const eo::Levels& contexlvl,
                          const eo::Levels& selectedlvl)
-    : outStream(&std::cout), /*ownedFileStream(NULL),*/ _contextLevel(contexlvl), _selectedLevel(selectedlvl)
+    : _outStream(&std::cout), _ownedFileStream(NULL), _contextLevel(contexlvl), _selectedLevel(selectedlvl)
 {}
 
 int eoLogger::outbuf::overflow(int_type c)
 {
     if (_selectedLevel >= _contextLevel)
       {
-        if (outStream && c != EOF)
+        if (_outStream && c != EOF)
           {
-              //::write(_fd, &c, 1);
+              (*_outStream) << (char) c;
-              (*outStream) << (char) c;
           }
       }
     return c;
@@ -222,10 +211,6 @@ int eoLogger::outbuf::overflow(int_type c)
 
 namespace eo
 {
-    /*file::file(const std::string f)
-        : _f(f)
-    {}*/
-
     setlevel::setlevel(const std::string v)
         : _v(v), _lvl((Levels)-1)
     {}

eo/src/utils/eoLogger.h

@@ -191,11 +191,11 @@ private:
     {
     public:
         outbuf(const eo::Levels& contexlvl, const eo::Levels& selectedlvl);
-        std::ostream * outStream;
+        std::ostream * _outStream;
+        std::ofstream * _ownedFileStream;
     protected:
         virtual int overflow(int_type c);
     private:
-        //std::ofstream * ownedFileStream;
         const eo::Levels& _contextLevel;
         const eo::Levels& _selectedLevel;
     };
@@ -213,12 +213,6 @@ public:
     //! in order to use stream style to define the context verbose level where the following logs will be saved
     friend eoLogger& operator<<(eoLogger&, const eo::Levels);
 
-    /**
-     * operator<< used there to set a filename through the class file.
-     */
-    //! in order to use stream style to define a file to dump instead the standart output
-    //friend eoLogger& operator<<(eoLogger&, eo::file);
-
     /**
      * operator<< used there to set a verbose level through the class setlevel.
      */
@@ -238,8 +232,14 @@ public:
      * Redirects the logger to a given output stream. Closing the stream and returning its memory is at the charge of the caller,
      * but should not be done while the log is still redirected to it.
      */
-    void redirectTo(std::ostream&);
+    void redirect(std::ostream&);
 
+    /**
+     * Redirects the logger to a file using a filename.
+     * Closing the file will be done automatically when the logger is redirected again or destroyed.
+     */
+    void redirect(const char * filename);
+    void redirect(const std::string& filename);
 
 private:
     friend void make_verbose(eoParser&);

eo/test/t-eoLogger.cpp

@@ -31,21 +31,24 @@ int main(int ac, char** av)
 
     //eo::log << eo::file("test.txt") << "In FILE" << std::endl;
 
-    std::ofstream ofs("test.txt");
+    std::ofstream ofs("logtest.txt");
     //eo::log << ofs << "In FILE" << std::endl;
-    eo::log.redirectTo(ofs);
+    eo::log.redirect(ofs);
     eo::log << "In FILE" << std::endl;
+    
+    eo::log.redirect("logtest2.txt");
+    eo::log << "In FILE 2" << std::endl;
 
     std::ostringstream oss;
     //eo::log << oss << "In STRINGSTREAM";
-    eo::log.redirectTo(oss);
+    eo::log.redirect(oss);
     eo::log << oss << "In STRINGSTREAM";
     
     //ofs << oss;
     std::cout << "Content of ostringstream: " << oss.str() << std::endl;
 
     //eo::log << std::cout << "on COUT" << std::endl;
-    eo::log.redirectTo(std::cout);
+    eo::log.redirect(std::cout);
     eo::log << "on COUT" << std::endl;
 
     eo::log << eo::setlevel("errors");