d0s3t3ch/wownero
1
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-08-15 01:03:23 +00:00
Code Issues Projects Releases Wiki Activity

easylogging++: minimal stdout logging format

Browse source 
It's a bit of a hack, but doing it right would need a lot
of changes to the easylogging++ source.
This commit is contained in:
moneromooo-monero 2019-04-11 22:23:55 +00:00
parent 37345921ec
commit 428249c5d1
No known key found for this signature in database
GPG key ID: 686F07454D6CEFC3
2 changed files with 22 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
external/easylogging++/easylogging++.cc vendored
View file

@ -2337,6 +2337,19 @@ base::threading::Mutex& LogDispatchCallback::fileHandle(const LogDispatchData* d
namespace base { namespace base {
// DefaultLogDispatchCallback // DefaultLogDispatchCallback
const char* convertToChar(Level level) {
// Do not use switch over strongly typed enums because Intel C++ compilers dont support them yet.
if (level == Level::Global) return "G";
if (level == Level::Debug) return "D";
if (level == Level::Info) return "I";
if (level == Level::Warning) return "W";
if (level == Level::Error) return "E";
if (level == Level::Fatal) return "F";
if (level == Level::Verbose) return "V";
if (level == Level::Trace) return "T";
return "?";
}
void DefaultLogDispatchCallback::handle(const LogDispatchData* data) { void DefaultLogDispatchCallback::handle(const LogDispatchData* data) {
#if defined(ELPP_THREAD_SAFE) #if defined(ELPP_THREAD_SAFE)
#if 0 #if 0
@ -2345,11 +2358,15 @@ void DefaultLogDispatchCallback::handle(const LogDispatchData* data) {
#endif #endif
#endif #endif
m_data = data; m_data = data;
dispatch(m_data->logMessage()->logger()->logBuilder()->build(m_data->logMessage(), base::TypedConfigurations* tc = m_data->logMessage()->logger()->typedConfigurations();
const base::LogFormat* logFormat = &tc->logFormat(m_data->logMessage()->level());
dispatch(base::utils::DateTime::getDateTime(logFormat->dateTimeFormat().c_str(), &tc->subsecondPrecision(m_data->logMessage()->level()))
+ "\t" + convertToChar(m_data->logMessage()->level()) + " " + m_data->logMessage()->message() + "\n",
m_data->logMessage()->logger()->logBuilder()->build(m_data->logMessage(),
m_data->dispatchAction() == base::DispatchAction::NormalLog || m_data->dispatchAction() == base::DispatchAction::FileOnlyLog)); m_data->dispatchAction() == base::DispatchAction::NormalLog || m_data->dispatchAction() == base::DispatchAction::FileOnlyLog));
} }
void DefaultLogDispatchCallback::dispatch(base::type::string_t&& logLine) { void DefaultLogDispatchCallback::dispatch(base::type::string_t&& rawLine, base::type::string_t&& logLine) {
if (m_data->dispatchAction() == base::DispatchAction::NormalLog || m_data->dispatchAction() == base::DispatchAction::FileOnlyLog) { if (m_data->dispatchAction() == base::DispatchAction::NormalLog || m_data->dispatchAction() == base::DispatchAction::FileOnlyLog) {
if (m_data->logMessage()->logger()->m_typedConfigurations->toFile(m_data->logMessage()->level())) { if (m_data->logMessage()->logger()->m_typedConfigurations->toFile(m_data->logMessage()->level())) {
base::type::fstream_t* fs = m_data->logMessage()->logger()->m_typedConfigurations->fileStream( base::type::fstream_t* fs = m_data->logMessage()->logger()->m_typedConfigurations->fileStream(
@ -2376,8 +2393,8 @@ void DefaultLogDispatchCallback::dispatch(base::type::string_t&& logLine) {
if (m_data->dispatchAction() != base::DispatchAction::FileOnlyLog) { if (m_data->dispatchAction() != base::DispatchAction::FileOnlyLog) {
if (m_data->logMessage()->logger()->m_typedConfigurations->toStandardOutput(m_data->logMessage()->level())) { if (m_data->logMessage()->logger()->m_typedConfigurations->toStandardOutput(m_data->logMessage()->level())) {
if (ELPP->hasFlag(LoggingFlag::ColoredTerminalOutput)) if (ELPP->hasFlag(LoggingFlag::ColoredTerminalOutput))
m_data->logMessage()->logger()->logBuilder()->convertToColoredOutput(&logLine, m_data->logMessage()->level()); m_data->logMessage()->logger()->logBuilder()->convertToColoredOutput(&rawLine, m_data->logMessage()->level());
ELPP_COUT << ELPP_COUT_LINE(logLine); ELPP_COUT << ELPP_COUT_LINE(rawLine);
} }
} }
} }

2
external/easylogging++/easylogging++.h vendored
View file

@ -2776,7 +2776,7 @@ class DefaultLogDispatchCallback : public LogDispatchCallback {
void handle(const LogDispatchData* data); void handle(const LogDispatchData* data);
private: private:
const LogDispatchData* m_data; const LogDispatchData* m_data;
void dispatch(base::type::string_t&& logLine); void dispatch(base::type::string_t&& rawLine, base::type::string_t&& logLine);
}; };
#if ELPP_ASYNC_LOGGING #if ELPP_ASYNC_LOGGING
class AsyncLogDispatchCallback : public LogDispatchCallback { class AsyncLogDispatchCallback : public LogDispatchCallback {