Changeset 8796 for code/branches/output/src/libraries/core/Core.cc
- Timestamp:
- Jul 30, 2011, 12:54:55 AM (13 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
code/branches/output/src/libraries/core/Core.cc
r8788 r8796 51 51 #endif 52 52 53 #include <boost/preprocessor/stringize.hpp> 54 53 55 #include "util/Clock.h" 54 56 #include "util/Output.h" 55 57 #include "util/Exception.h" 58 #include "util/output/LogWriter.h" 56 59 #include "util/Scope.h" 57 60 #include "util/ScopedSingletonManager.h" … … 142 145 this->signalHandler_->doCatch(PathConfig::getExecutablePathString(), PathConfig::getLogPathString() + "orxonox_crash.log"); 143 146 144 // Set the correct log path. Before this call, /tmp (Unix) or %TEMP% (Windows) was used145 OutputHandler::getInstance().setLogPath(PathConfig::getLogPathString());146 147 147 #ifdef ORXONOX_PLATFORM_WINDOWS 148 148 // limit the main thread to the first core so that QueryPerformanceCounter doesn't jump … … 166 166 RegisterRootObject(Core); 167 167 this->setConfigValues(); 168 // Rewrite the log file with the correct log levels 169 OutputHandler::getInstance().rewriteLogFile(); 168 169 // Set the correct log path and rewrite the log file with the correct log levels 170 LogWriter::getInstance().setLogPath(PathConfig::getLogPathString()); 170 171 171 172 #if !defined(ORXONOX_PLATFORM_APPLE) && !defined(ORXONOX_USE_WINMAIN) … … 232 233 namespace DefaultLevelLogFile 233 234 { 234 const OutputLevel::Value Dev = OutputLevel::Debug; 235 const OutputLevel::Value User = OutputLevel::Info; 235 #pragma message(__FILE__ "("BOOST_PP_STRINGIZE(__LINE__)") : Warning: TODO: inspect this (and remove boost include)") 236 const OutputLevel Dev = level::internal_info; 237 const OutputLevel User = level::internal_info; 236 238 } 237 239 … … 240 242 { 241 243 // Choose the default level according to the path Orxonox was started (build directory or not) 242 OutputLevel ::ValuedefaultLogLevel = (PathConfig::buildDirectoryRun() ? DefaultLevelLogFile::Dev : DefaultLevelLogFile::User);244 OutputLevel defaultLogLevel = (PathConfig::buildDirectoryRun() ? DefaultLevelLogFile::Dev : DefaultLevelLogFile::User); 243 245 244 246 SetConfigValueExternal(debugLevelLogFile_, "OutputHandler", "debugLevelLogFile", defaultLogLevel) 245 247 .description("The maximum level of debug output written to the log file"); 246 OutputHandler::getInstance().setSoftDebugLevel("LogFile",debugLevelLogFile_);248 LogWriter::getInstance().setLevelMax(this->debugLevelLogFile_); 247 249 248 250 SetConfigValue(bDevMode_, PathConfig::buildDirectoryRun()) … … 286 288 else 287 289 { 288 OutputLevel ::Valuelevel = (bDevMode_ ? DefaultLevelLogFile::Dev : DefaultLevelLogFile::User);290 OutputLevel level = (bDevMode_ ? DefaultLevelLogFile::Dev : DefaultLevelLogFile::User); 289 291 ModifyConfigValueExternal(debugLevelLogFile_, "debugLevelLogFile", tset, level); 290 292 }
Note: See TracChangeset
for help on using the changeset viewer.