Changeset 6000 for code/branches

Timestamp:

Oct 28, 2009, 11:18:20 AM (15 years ago)

Author:

rgrieder

Message:

Resolved a bug causing the static initialisation of the OutputHandler to go nuts.

File:

• code/branches/console/src/libraries/util/OutputHandler.cc (modified) (4 diffs)

code/branches/console/src/libraries/util/OutputHandler.cc

@@ -63 +63 @@
     {
     public:
-        //! Gets temporary log path and starts the log file
-        LogFileWriter()
+        /**
+        @brief
+            Gets temporary log path and starts the log file
+        @param outputHandler
+            This is only required to avoid another call to getInstance (this c'tor was
+            called from getInstance!)
+        */
+        LogFileWriter(OutputHandler& outputHandler)
             : OutputListener(OutputHandler::logFileOutputListenerName_s)
         {
@@ -87 +93 @@
             this->outputStream_ = &this->logFile_;
             // Use default level until we get the configValue from the Core
-            OutputHandler::getInstance().setSoftDebugLevel(this->getOutputListenerName(), OutputLevel::Debug);
-            OutputHandler::getInstance().registerOutputListener(this);
+            outputHandler.setSoftDebugLevel(this->getOutputListenerName(), OutputLevel::Debug);
+            outputHandler.registerOutputListener(this);
         }
 
@@ -134 +140 @@
         friend class OutputHandler;
 
-        //! Sets the right soft debug level and registers itself
-        MemoryLogWriter()
+        /**
+        @brief
+            Sets the right soft debug level and registers itself
+        @param outputHandler
+            This is only required to avoid another call to getInstance (this c'tor was
+            called from getInstance!)
+        */
+        MemoryLogWriter(OutputHandler& outputHandler)
             : OutputListener("memoryLog")
         {
             this->outputStream_ = &this->buffer_;
             // We capture as much input as the listener with the highest level
-            OutputHandler::getInstance().setSoftDebugLevel(this->getOutputListenerName(), OutputHandler::getSoftDebugLevel());
-            OutputHandler::getInstance().registerOutputListener(this);
+            outputHandler.setSoftDebugLevel(this->getOutputListenerName(), OutputHandler::getSoftDebugLevel());
+            outputHandler.registerOutputListener(this);
         }
 
@@ -170 +182 @@
         : outputLevel_(OutputLevel::Verbose)
     {
-        this->logFile_ = new LogFileWriter();
-        this->output_  = new MemoryLogWriter();
+        this->logFile_ = new LogFileWriter(*this);
+        this->output_  = new MemoryLogWriter(*this);
     }