mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-13 23:40:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Adapt to Ghoul changes of moving LogLevel out of LogManager

Browse Source
This commit is contained in:
Alexander Bock
2016-12-14 22:59:22 +01:00
parent c390f6be30
commit aa2ac511ff
7 changed files with 88 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/engine/openspaceengine.cpp
View File

@@ -231,7 +231,7 @@ bool OpenSpaceEngine::create(int argc, char** argv,
// configuration file, we will deinitialize this LogManager and reinitialize it later
// with the correct LogLevel
LogManager::initialize(
LogManager::LogLevel::Debug,
LogLevel::Debug,
ghoul::logging::LogManager::ImmediateFlush::Yes
);
LogMgr.addLog(std::make_unique<ConsoleLog>());
@@ -792,7 +792,7 @@ void OpenSpaceEngine::configureLogging() {
bool immediateFlush = false;
configurationManager().getValue(KeyLogImmediateFlush, immediateFlush);
LogManager::LogLevel level = LogManager::levelFromString(logLevel);
LogLevel level = ghoul::logging::levelFromString(logLevel);
LogManager::deinitialize();
using ImmediateFlush = ghoul::logging::LogManager::ImmediateFlush;
LogManager::initialize(
@@ -938,9 +938,9 @@ void OpenSpaceEngine::postSynchronizationPreDraw() {
// Testing this every frame has minimal impact on the performance --- abock
// Debug build: 1-2 us ; Release build: <= 1 us
using ghoul::logging::LogManager;
int warningCounter = LogMgr.messageCounter(LogManager::LogLevel::Warning);
int errorCounter = LogMgr.messageCounter(LogManager::LogLevel::Error);
int fatalCounter = LogMgr.messageCounter(LogManager::LogLevel::Fatal);
int warningCounter = LogMgr.messageCounter(LogLevel::Warning);
int errorCounter = LogMgr.messageCounter(LogLevel::Error);
int fatalCounter = LogMgr.messageCounter(LogLevel::Fatal);
if (warningCounter > 0)
LWARNINGC("Logging", "Number of Warnings raised: " << warningCounter);