sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove DefaultLogger, just accept a SetLogger before initialization

This commit is contained in:
Ardakaniz 2016-10-16 18:34:01 +02:00
parent 308a603324
commit 495976bff6
2 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/Nazara/Core/Log.hpp
View File

@ -41,7 +41,6 @@ namespace Nz
static bool IsEnabled(); static bool IsEnabled();
static void SetDefaultLogger(AbstractLogger* defaultLogger);
static void SetLogger(AbstractLogger* logger); static void SetLogger(AbstractLogger* logger);
static void Write(const String& string); static void Write(const String& string);
@ -54,7 +53,6 @@ namespace Nz
static bool Initialize(); static bool Initialize();
static void Uninitialize(); static void Uninitialize();
static AbstractLogger* s_defaultLogger;
static AbstractLogger* s_logger; static AbstractLogger* s_logger;
static bool s_enabled; static bool s_enabled;
}; };

25
src/Nazara/Core/Log.cpp
View File

@ -52,22 +52,6 @@ namespace Nz
return s_enabled; return s_enabled;
} }
/*!
* \brief Sets the default logger
*
* \param defaultLogger Default AbstractLogger
*/
void Log::SetDefaultLogger(AbstractLogger* defaultLogger)
{
if (s_defaultLogger != &s_stdLogger)
delete s_defaultLogger;
s_defaultLogger = defaultLogger;
if (!s_defaultLogger)
s_defaultLogger = &s_stdLogger;
}
/*! /*!
* \brief Sets the logger * \brief Sets the logger
* *
@ -127,7 +111,12 @@ namespace Nz
bool Log::Initialize() bool Log::Initialize()
{ {
SetLogger(s_defaultLogger); if (s_logger == s_stdLogger)
{
s_logger = new FileLogger();
}
SetLogger(s_logger);
return true; return true;
} }
@ -137,14 +126,12 @@ namespace Nz
void Log::Uninitialize() void Log::Uninitialize()
{ {
SetDefaultLogger(nullptr);
SetLogger(nullptr); SetLogger(nullptr);
} }
NazaraStaticSignalImpl(Log, OnLogWrite); NazaraStaticSignalImpl(Log, OnLogWrite);
NazaraStaticSignalImpl(Log, OnLogWriteError); NazaraStaticSignalImpl(Log, OnLogWriteError);
AbstractLogger* Log::s_defaultLogger = &s_stdLogger;
AbstractLogger* Log::s_logger = &s_stdLogger; AbstractLogger* Log::s_logger = &s_stdLogger;
bool Log::s_enabled = true; bool Log::s_enabled = true;
} }