mirror of
https://github.com/monero-project/monero.git
synced 2024-12-26 01:49:23 -05:00
easylogging++: update to v9.96.7
This commit is contained in:
parent
5dbcceb664
commit
66d73d2f7d
23
external/easylogging++/easylogging++.cc
vendored
23
external/easylogging++/easylogging++.cc
vendored
@ -1,17 +1,16 @@
|
|||||||
//
|
//
|
||||||
// Bismillah ar-Rahmaan ar-Raheem
|
// Bismillah ar-Rahmaan ar-Raheem
|
||||||
//
|
//
|
||||||
// Easylogging++ v9.96.5
|
// Easylogging++ v9.96.7
|
||||||
// Cross-platform logging library for C++ applications
|
// Cross-platform logging library for C++ applications
|
||||||
//
|
//
|
||||||
// Copyright (c) 2012-2018 Muflihun Labs
|
// Copyright (c) 2012-2018 Zuhd Web Services
|
||||||
// Copyright (c) 2012-2018 @abumusamq
|
// Copyright (c) 2012-2018 @abumusamq
|
||||||
//
|
//
|
||||||
// This library is released under the MIT Licence.
|
// This library is released under the MIT Licence.
|
||||||
// https://github.com/muflihun/easyloggingpp/blob/master/LICENSE
|
// https://github.com/zuhd-org/easyloggingpp/blob/master/LICENSE
|
||||||
//
|
//
|
||||||
// https://github.com/muflihun/easyloggingpp
|
// https://zuhd.org
|
||||||
// https://muflihun.github.io/easyloggingpp
|
|
||||||
// http://muflihun.com
|
// http://muflihun.com
|
||||||
//
|
//
|
||||||
|
|
||||||
@ -962,7 +961,7 @@ void Str::replaceFirstWithEscape(base::type::string_t& str, const base::type::st
|
|||||||
std::size_t foundAt = base::type::string_t::npos;
|
std::size_t foundAt = base::type::string_t::npos;
|
||||||
while ((foundAt = str.find(replaceWhat, foundAt + 1)) != base::type::string_t::npos) {
|
while ((foundAt = str.find(replaceWhat, foundAt + 1)) != base::type::string_t::npos) {
|
||||||
if (foundAt > 0 && str[foundAt - 1] == base::consts::kFormatSpecifierChar) {
|
if (foundAt > 0 && str[foundAt - 1] == base::consts::kFormatSpecifierChar) {
|
||||||
str.erase(foundAt > 0 ? foundAt - 1 : 0, 1);
|
str.erase(foundAt - 1, 1);
|
||||||
++foundAt;
|
++foundAt;
|
||||||
} else {
|
} else {
|
||||||
str.replace(foundAt, replaceWhat.length(), replaceWith);
|
str.replace(foundAt, replaceWhat.length(), replaceWith);
|
||||||
@ -1531,7 +1530,7 @@ void LogFormat::parseFromFormat(const base::type::string_t& userFormat) {
|
|||||||
if (hasFlag(flag)) {
|
if (hasFlag(flag)) {
|
||||||
// If we already have flag we remove the escape chars so that '%%' is turned to '%'
|
// If we already have flag we remove the escape chars so that '%%' is turned to '%'
|
||||||
// even after specifier resolution - this is because we only replaceFirst specifier
|
// even after specifier resolution - this is because we only replaceFirst specifier
|
||||||
formatCopy.erase(foundAt > 0 ? foundAt - 1 : 0, 1);
|
formatCopy.erase(foundAt - 1, 1);
|
||||||
++foundAt;
|
++foundAt;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@ -2206,20 +2205,26 @@ Storage::Storage(const LogBuilderPtr& defaultLogBuilder) :
|
|||||||
m_registeredLoggers(new base::RegisteredLoggers(defaultLogBuilder)),
|
m_registeredLoggers(new base::RegisteredLoggers(defaultLogBuilder)),
|
||||||
m_flags(ELPP_DEFAULT_LOGGING_FLAGS),
|
m_flags(ELPP_DEFAULT_LOGGING_FLAGS),
|
||||||
m_vRegistry(new base::VRegistry(0, &m_flags)),
|
m_vRegistry(new base::VRegistry(0, &m_flags)),
|
||||||
|
|
||||||
#if ELPP_ASYNC_LOGGING
|
#if ELPP_ASYNC_LOGGING
|
||||||
m_asyncLogQueue(new base::AsyncLogQueue()),
|
m_asyncLogQueue(new base::AsyncLogQueue()),
|
||||||
m_asyncDispatchWorker(asyncDispatchWorker),
|
m_asyncDispatchWorker(asyncDispatchWorker),
|
||||||
#endif // ELPP_ASYNC_LOGGING
|
#endif // ELPP_ASYNC_LOGGING
|
||||||
|
|
||||||
m_preRollOutCallback(base::defaultPreRollOutCallback) {
|
m_preRollOutCallback(base::defaultPreRollOutCallback) {
|
||||||
// Register default logger
|
// Register default logger
|
||||||
m_registeredLoggers->get(std::string(base::consts::kDefaultLoggerId));
|
m_registeredLoggers->get(std::string(base::consts::kDefaultLoggerId));
|
||||||
// We register default logger anyway (worse case it's not going to register) just in case
|
// We register default logger anyway (worse case it's not going to register) just in case
|
||||||
m_registeredLoggers->get("default");
|
m_registeredLoggers->get("default");
|
||||||
|
|
||||||
|
#if defined(ELPP_FEATURE_ALL) || defined(ELPP_FEATURE_PERFORMANCE_TRACKING)
|
||||||
// Register performance logger and reconfigure format
|
// Register performance logger and reconfigure format
|
||||||
Logger* performanceLogger = m_registeredLoggers->get(std::string(base::consts::kPerformanceLoggerId));
|
Logger* performanceLogger = m_registeredLoggers->get(std::string(base::consts::kPerformanceLoggerId));
|
||||||
m_registeredLoggers->get("performance");
|
m_registeredLoggers->get("performance");
|
||||||
performanceLogger->configurations()->setGlobally(ConfigurationType::Format, std::string("%datetime %level %msg"));
|
performanceLogger->configurations()->setGlobally(ConfigurationType::Format, std::string("%datetime %level %msg"));
|
||||||
performanceLogger->reconfigure();
|
performanceLogger->reconfigure();
|
||||||
|
#endif // defined(ELPP_FEATURE_ALL) || defined(ELPP_FEATURE_PERFORMANCE_TRACKING)
|
||||||
|
|
||||||
#if defined(ELPP_SYSLOG)
|
#if defined(ELPP_SYSLOG)
|
||||||
// Register syslog logger and reconfigure format
|
// Register syslog logger and reconfigure format
|
||||||
Logger* sysLogLogger = m_registeredLoggers->get(std::string(base::consts::kSysLogLoggerId));
|
Logger* sysLogLogger = m_registeredLoggers->get(std::string(base::consts::kSysLogLoggerId));
|
||||||
@ -3279,11 +3284,11 @@ const std::string &Loggers::getFilenameCommonPrefix() {
|
|||||||
// VersionInfo
|
// VersionInfo
|
||||||
|
|
||||||
const std::string VersionInfo::version(void) {
|
const std::string VersionInfo::version(void) {
|
||||||
return std::string("9.96.5");
|
return std::string("9.96.7");
|
||||||
}
|
}
|
||||||
/// @brief Release date of current version
|
/// @brief Release date of current version
|
||||||
const std::string VersionInfo::releaseDate(void) {
|
const std::string VersionInfo::releaseDate(void) {
|
||||||
return std::string("07-09-2018 0950hrs");
|
return std::string("24-11-2018 0728hrs");
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace el
|
} // namespace el
|
||||||
|
13
external/easylogging++/easylogging++.h
vendored
13
external/easylogging++/easylogging++.h
vendored
@ -1,17 +1,16 @@
|
|||||||
//
|
//
|
||||||
// Bismillah ar-Rahmaan ar-Raheem
|
// Bismillah ar-Rahmaan ar-Raheem
|
||||||
//
|
//
|
||||||
// Easylogging++ v9.96.5
|
// Easylogging++ v9.96.7
|
||||||
// Single-header only, cross-platform logging library for C++ applications
|
// Single-header only, cross-platform logging library for C++ applications
|
||||||
//
|
//
|
||||||
// Copyright (c) 2012-2018 Muflihun Labs
|
// Copyright (c) 2012-2018 Zuhd Web Services
|
||||||
// Copyright (c) 2012-2018 @abumusamq
|
// Copyright (c) 2012-2018 @abumusamq
|
||||||
//
|
//
|
||||||
// This library is released under the MIT Licence.
|
// This library is released under the MIT Licence.
|
||||||
// https://github.com/muflihun/easyloggingpp/blob/master/LICENSE
|
// https://github.com/zuhd-org/easyloggingpp/blob/master/LICENSE
|
||||||
//
|
//
|
||||||
// https://github.com/muflihun/easyloggingpp
|
// https://zuhd.org
|
||||||
// https://muflihun.github.io/easyloggingpp
|
|
||||||
// http://muflihun.com
|
// http://muflihun.com
|
||||||
//
|
//
|
||||||
|
|
||||||
@ -758,10 +757,12 @@ static const char* kDefaultLoggerId = ELPP_DEFAULT_L
|
|||||||
static const char* kDefaultLoggerId = "default";
|
static const char* kDefaultLoggerId = "default";
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined(ELPP_FEATURE_ALL) || defined(ELPP_FEATURE_PERFORMANCE_TRACKING)
|
||||||
#ifdef ELPP_DEFAULT_PERFORMANCE_LOGGER
|
#ifdef ELPP_DEFAULT_PERFORMANCE_LOGGER
|
||||||
static const char* kPerformanceLoggerId = ELPP_DEFAULT_PERFORMANCE_LOGGER;
|
static const char* kPerformanceLoggerId = ELPP_DEFAULT_PERFORMANCE_LOGGER;
|
||||||
#else
|
#else
|
||||||
static const char* kPerformanceLoggerId = "performance";
|
static const char* kPerformanceLoggerId = "performance";
|
||||||
|
#endif // ELPP_DEFAULT_PERFORMANCE_LOGGER
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if defined(ELPP_SYSLOG)
|
#if defined(ELPP_SYSLOG)
|
||||||
@ -3836,7 +3837,7 @@ class Helpers : base::StaticClass {
|
|||||||
return ELPP->hasCustomFormatSpecifier(formatSpecifier);
|
return ELPP->hasCustomFormatSpecifier(formatSpecifier);
|
||||||
}
|
}
|
||||||
static inline void validateFileRolling(Logger* logger, Level level) {
|
static inline void validateFileRolling(Logger* logger, Level level) {
|
||||||
if (logger == nullptr) return;
|
if (ELPP == nullptr || logger == nullptr) return;
|
||||||
logger->m_typedConfigurations->validateFileRolling(level, ELPP->preRollOutCallback());
|
logger->m_typedConfigurations->validateFileRolling(level, ELPP->preRollOutCallback());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user