Changeset ef9dff6 for src/Helpers/errorlogger.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/errorlogger.cpp (modified) (6 diffs)

src/Helpers/errorlogger.cpp

@@ -28 +28 @@
 int errorLogger::verbosity = 2;
 ostream* errorLogger::nix = NULL;
+ostream* errorLogger::defaultout = NULL;
+ostream* errorLogger::out = NULL;
 
 /**
@@ -37 +39 @@
 {
   nix = new ofstream("/dev/null");
+  defaultout = &cerr;
+  out = defaultout;
 };
 
@@ -45 +49 @@
 {
   delete nix;
+  out = NULL;   // we are not responsible if out got changed
+  defaultout = NULL; // do not delete cerr
 }
 
@@ -67 +73 @@
   return verbosity;
 }
+
+/** Sets a new output stream.
+ *
+ * \param _newout new output stream, if NULL we set to defaultout
+ */
+void errorLogger::setOutputStream(ostream *_newout)
+{
+  if(_newout != NULL)
+    out = _newout;
+  else
+    out = defaultout;
+}
+
 
 /**
@@ -95 +114 @@
         break;
     }
-    v.print(cerr);
-    return cerr;
+    v.print(*errorLogger::out);
+    return *errorLogger::out;
   } else
     return *l.nix;
@@ -117 +136 @@
         break;
     }
-    v.print(cerr);
-    return cerr;
+    v.print(*errorLogger::out);
+    return *errorLogger::out;
   } else
     return *l->nix;