Changeset ef9dff6 for src/Helpers/logger.cpp

Timestamp:

Jul 14, 2014, 8:37:03 PM (11 years ago)

Author:

Frederik Heber <heber@…>

Children:

0ab195

Parents:

ca940b

git-author:

Frederik Heber <heber@…> (06/19/14 16:26:39)

git-committer:

Frederik Heber <heber@…> (07/14/14 20:37:03)

Message:

logger and errorLogger have new setOutputStream().

• this allows to redirect the logging streams in a program internally, e.g. in a GUI setting.
• added unit test on this function.
• TESTFIX: LogUnitTest used loggerStub which made the tests useless.

File:

• src/Helpers/logger.cpp (modified) (6 diffs)

src/Helpers/logger.cpp

@@ -29 +29 @@
 int logger::verbosity = 2;
 ostream* logger::nix = NULL;
+ostream* logger::defaultout = NULL;
+ostream* logger::out = NULL;
 
 /**
@@ -38 +40 @@
 {
   nix = new ofstream("/dev/null");
+  defaultout = &cout;
+  out = defaultout;
 };
 
@@ -46 +50 @@
 {
   delete nix;
+  out = NULL;   // we are not responsible if out got changed
+  defaultout = NULL; // do not delete cout
 }
 
@@ -69 +75 @@
 }
 
+/** Sets a new output stream.
+ *
+ * \param _newout new output stream, if NULL we set to defaultout
+ */
+void logger::setOutputStream(ostream *_newout)
+{
+  if(_newout != NULL)
+    out = _newout;
+  else
+    out = defaultout;
+}
+
 /**
  * Operator for the Binary(arg) call.
@@ -83 +101 @@
   l.nix->clear();
   if (v.DoOutput(verbosityLevel)) {
-    v.print(cout);
-    return cout;
+    v.print(*logger::out);
+    return *logger::out;
   } else
     return *l.nix;
@@ -93 +111 @@
   l->nix->clear();
   if (v.DoOutput(verbosityLevel)) {
-    v.print(cout);
-    return cout;
+    v.print(*logger::out);
+    return *logger::out;
   } else
     return *l->nix;