rottenwheel/monero
1
0
Fork 0
mirror of https://codeberg.org/anoncontributorxmr/monero.git synced 2024-11-10 21:23:27 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

easylogging++: make the logger handle early/late logging

Browse Source
This commit is contained in:
moneromooo-monero 2018-07-15 12:57:45 +01:00
parent eed4dba880
commit 7f8bdeb35c
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
external/easylogging++/easylogging++.cc vendored
View File

@ -2092,6 +2092,17 @@ void VRegistry::setFromArgs(const base::utils::CommandLineArgs* commandLineArgs)
# define ELPP_DEFAULT_LOGGING_FLAGS 0x0 # define ELPP_DEFAULT_LOGGING_FLAGS 0x0
#endif // !defined(ELPP_DEFAULT_LOGGING_FLAGS) #endif // !defined(ELPP_DEFAULT_LOGGING_FLAGS)
// Storage // Storage
el::base::type::StoragePointer getresetELPP(bool reset)
{
static el::base::type::StoragePointer p(new el::base::Storage(el::LogBuilderPtr(new el::base::DefaultLogBuilder())));
if (reset)
p = NULL;
return p;
}
el::base::type::StoragePointer el::base::Storage::getELPP()
{
return getresetELPP(false);
}
#if ELPP_ASYNC_LOGGING #if ELPP_ASYNC_LOGGING
Storage::Storage(const LogBuilderPtr& defaultLogBuilder, base::IWorker* asyncDispatchWorker) : Storage::Storage(const LogBuilderPtr& defaultLogBuilder, base::IWorker* asyncDispatchWorker) :
#else #else
@ -2140,6 +2151,7 @@ Storage::Storage(const LogBuilderPtr& defaultLogBuilder) :
Storage::~Storage(void) { Storage::~Storage(void) {
ELPP_INTERNAL_INFO(4, "Destroying storage"); ELPP_INTERNAL_INFO(4, "Destroying storage");
getresetELPP(true);
#if ELPP_ASYNC_LOGGING #if ELPP_ASYNC_LOGGING
ELPP_INTERNAL_INFO(5, "Replacing log dispatch callback to synchronous"); ELPP_INTERNAL_INFO(5, "Replacing log dispatch callback to synchronous");
uninstallLogDispatchCallback<base::AsyncLogDispatchCallback>(std::string("AsyncLogDispatchCallback")); uninstallLogDispatchCallback<base::AsyncLogDispatchCallback>(std::string("AsyncLogDispatchCallback"));

9
external/easylogging++/easylogging++.h vendored
View File

@ -2766,6 +2766,8 @@ class Storage : base::NoCopy, public base::threading::ThreadSafe {
return it->second; return it->second;
} }
static el::base::type::StoragePointer getELPP();
private: private:
base::RegisteredHitCounters* m_registeredHitCounters; base::RegisteredHitCounters* m_registeredHitCounters;
base::RegisteredLoggers* m_registeredLoggers; base::RegisteredLoggers* m_registeredLoggers;
@ -2798,7 +2800,7 @@ class Storage : base::NoCopy, public base::threading::ThreadSafe {
} }
}; };
extern ELPP_EXPORT base::type::StoragePointer elStorage; extern ELPP_EXPORT base::type::StoragePointer elStorage;
#define ELPP el::base::elStorage #define ELPP el::base::Storage::getELPP()
class DefaultLogDispatchCallback : public LogDispatchCallback { class DefaultLogDispatchCallback : public LogDispatchCallback {
protected: protected:
void handle(const LogDispatchData* data); void handle(const LogDispatchData* data);
@ -4628,10 +4630,9 @@ el::base::debug::CrashHandler elCrashHandler(ELPP_USE_DEF_CRASH_HANDLER); \
} }
#if ELPP_ASYNC_LOGGING #if ELPP_ASYNC_LOGGING
# define INITIALIZE_EASYLOGGINGPP ELPP_INIT_EASYLOGGINGPP(new el::base::Storage(el::LogBuilderPtr(new el::base::DefaultLogBuilder()),\ # define INITIALIZE_EASYLOGGINGPP ELPP_INIT_EASYLOGGINGPP(NULL)
new el::base::AsyncDispatchWorker()))
#else #else
# define INITIALIZE_EASYLOGGINGPP ELPP_INIT_EASYLOGGINGPP(new el::base::Storage(el::LogBuilderPtr(new el::base::DefaultLogBuilder()))) # define INITIALIZE_EASYLOGGINGPP ELPP_INIT_EASYLOGGINGPP(NULL)
#endif // ELPP_ASYNC_LOGGING #endif // ELPP_ASYNC_LOGGING
#define INITIALIZE_NULL_EASYLOGGINGPP \ #define INITIALIZE_NULL_EASYLOGGINGPP \
namespace el {\ namespace el {\