mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-16 00:41:18 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adding capabilities to configure the LogLevel and ImmediateFlush of the LogManager

Browse Source
This commit is contained in:
Alexander Bock
2014-12-05 16:43:54 +01:00
parent cf53b5c1b0
commit d9fbf7c5fd
4 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/engine/openspaceengine.cpp
View File

@@ -232,9 +232,26 @@ void OpenSpaceEngine::loadFonts() {
}
}
void OpenSpaceEngine::createLogs() {
void OpenSpaceEngine::configureLogging() {
using constants::configurationmanager::keyLogLevel;
using constants::configurationmanager::keyLogs;
if (configurationManager().hasKeyAndValue<std::string>(keyLogLevel)) {
using constants::configurationmanager::keyLogLevel;
using constants::configurationmanager::keyLogImmediateFlush;
std::string logLevel;
configurationManager().getValue(keyLogLevel, logLevel);
bool immediateFlush = false;
configurationManager().getValue(keyLogImmediateFlush, immediateFlush);
LogManager::LogLevel level = LogManager::levelFromString(logLevel);
LogManager::deinitialize();
LogManager::initialize(level, immediateFlush);
LogMgr.addLog(new ConsoleLog);
}
if (configurationManager().hasKeyAndValue<ghoul::Dictionary>(keyLogs)) {
ghoul::Dictionary logs;
configurationManager().getValue(keyLogs, logs);
@@ -257,9 +274,11 @@ bool OpenSpaceEngine::create(int argc, char** argv,
// TODO custom assert (ticket #5)
assert(_engine == nullptr);
// Initialize the Logmanager and add the console log as this will be used every time
// Initialize the LogManager and add the console log as this will be used every time
// and we need a fall back if something goes wrong between here and when we add the
// logs from the configuration file
// logs from the configuration file. If the user requested as specific loglevel in the
// configuration file, we will deinitialize this LogManager and reinitialize it later
// with the correct LogLevel
LogManager::initialize(LogManager::LogLevel::Debug, true);
LogMgr.addLog(new ConsoleLog);
ghoul::filesystem::FileSystem::initialize();
@@ -310,7 +329,7 @@ bool OpenSpaceEngine::create(int argc, char** argv,
}
// Initialize the requested logs from the configuration file
_engine->createLogs();
_engine->configureLogging();
// Create directories that doesn't exist
auto tokens = FileSys.tokens();