Changeset 2685 for code/branches/buildsystem3/src/util

Timestamp:

Feb 20, 2009, 5:32:04 PM (16 years ago)

Author:

rgrieder

Message:

Fixed install target:

• log and config file go a to separate folder each
• The SignalHandler crash log is now "orxonox_crash.log" to avoid opening the file twice which might result in problems
• moved tcl scripts to media/tcl8.#/ as a temporary solution. I've also created a ticket to fix this.
• UPDATE YOUR MEDIA REPOSITORY
• orxonox.log pre-main gets written to either %TEMP% (windows) or /tmp (Unix) and when the path was set, the content is copied.
• removed Settings class and moved media path to Core
• media, log and config path are now all in Core where only the media path can be configured via ini file or command line
• Core::isDevBuild() tells whether we are running in the build or the installation directory (determined by the presence of "orxonox_dev_build.kepp_me" in the binary dir)
• renamed Settings::getDataPath to Core::getMediaPath

Location:

code/branches/buildsystem3/src/util

Files:

• OutputBuffer.cc (modified) (3 diffs)
• OutputHandler.cc (modified) (5 diffs)
• OutputHandler.h (modified) (2 diffs)
• SignalHandler.cc (modified) (1 diff)

code/branches/buildsystem3/src/util/OutputBuffer.cc

@@ -68 +68 @@
     OutputBuffer& OutputBuffer::operator<<(std::ostream& (*manipulator)(std::ostream&))
     {
-                this->stream_ << manipulator;
-                this->callListeners();
-                return *this;
+        this->stream_ << manipulator;
+        this->callListeners();
+        return *this;
     }
 
@@ -79 +79 @@
     OutputBuffer& OutputBuffer::operator<<(std::ios& (*manipulator)(std::ios&))
     {
-                this->stream_ << manipulator;
-                this->callListeners();
-                return *this;
+        this->stream_ << manipulator;
+        this->callListeners();
+        return *this;
     }
 
@@ -90 +90 @@
     OutputBuffer& OutputBuffer::operator<<(std::ios_base& (*manipulator)(std::ios_base&))
     {
-                this->stream_ << manipulator;
-                this->callListeners();
-                return *this;
+        this->stream_ << manipulator;
+        this->callListeners();
+        return *this;
     }
 

code/branches/buildsystem3/src/util/OutputHandler.cc

@@ -33 +33 @@
 
 #include "OutputHandler.h"
-#include <time.h>
+
+#include <ctime>
+#include <cstdlib>
 
 namespace orxonox
@@ -41 +43 @@
         @param logfilename The name of the logfile
     */
-    OutputHandler::OutputHandler(const std::string& logfilename)
-    {
+    OutputHandler::OutputHandler()
+    {
+#ifdef ORXONOX_PLATFORM_WINDOWS
+        char* pTempDir = getenv("TEMP");
+        this->logfilename_ = std::string(pTempDir) + "/orxonox.log";
+#else
+        this->logfilename_ = "/tmp/orxonox.log";
+#endif
+#ifdef NDEBUG
+        this->softDebugLevel_[LD_All] = this->softDebugLevel_[LD_Logfile] = 2;
+        this->softDebugLevel_[LD_Console] = this->softDebugLevel_[LD_Shell] = 1;
+#else
+        this->softDebugLevel_[LD_All] = this->softDebugLevel_[LD_Logfile] = 3;
+        this->softDebugLevel_[LD_Console] = this->softDebugLevel_[LD_Shell] = 2;
+#endif
+
         this->outputBuffer_ = &this->fallbackBuffer_;
-        this->softDebugLevel_[0] = this->softDebugLevel_[1] = this->softDebugLevel_[2] = this->softDebugLevel_[3] = 2;
-        this->logfilename_ = logfilename;
         this->logfile_.open(this->logfilename_.c_str(), std::fstream::out);
 
@@ -53 +67 @@
         timeinfo = localtime(&rawtime);
 
-        this->logfile_ << "Started log at " << asctime(timeinfo) << std::endl;
+        this->logfile_ << "Started log on " << asctime(timeinfo) << std::endl;
         this->logfile_.flush();
     }
@@ -72 +86 @@
     OutputHandler& OutputHandler::getOutStream()
     {
-        static OutputHandler orxout("orxonox.log");
+        static OutputHandler orxout;
         return orxout;
     }
@@ -112 +126 @@
 
     /**
+        @brief Sets the path where to create orxonox.log
+        @param Path string with trailing slash
+    */
+    void OutputHandler::setLogPath(const std::string& path)
+    {
+        OutputHandler::getOutStream().logfile_.close();
+        // store old content
+        std::ifstream old;
+        old.open(OutputHandler::getOutStream().logfilename_.c_str());
+        OutputHandler::getOutStream().logfilename_ = path + "orxonox.log";
+        OutputHandler::getOutStream().logfile_.open(OutputHandler::getOutStream().logfilename_.c_str(), std::fstream::out);
+        OutputHandler::getOutStream().logfile_ << old.rdbuf();
+        old.close();
+        OutputHandler::getOutStream().logfile_.flush();
+    }
+
+    /**
         @brief Overloaded << operator, redirects the output to the console and the logfile.
         @param sb The streambuffer that should be shown in the console

code/branches/buildsystem3/src/util/OutputHandler.h

@@ -101 +101 @@
             static int getSoftDebugLevel(OutputHandler::OutputDevice device = OutputHandler::LD_All);
 
+            static void setLogPath(const std::string& path);
+
             void setOutputBuffer(OutputBuffer* buffer);
 
@@ -142 +144 @@
 
         private:
-            explicit OutputHandler(const std::string& logfilename);
-            OutputHandler(const OutputHandler& oh);  // don't copy
+            explicit OutputHandler();
+            OutputHandler(const OutputHandler& oh);
             virtual ~OutputHandler();
 

code/branches/buildsystem3/src/util/SignalHandler.cc

@@ -159 +159 @@
       }
 
-      COUT(0) << "recieved signal " << sigName.c_str() << std::endl << "try to write backtrace to file orxonox.log" << std::endl;
+      COUT(0) << "recieved signal " << sigName.c_str() << std::endl << "try to write backtrace to file orxonox_crash.log" << std::endl;
 
       int sigPipe[2];