diff options
author | Mark Benvenuto <mark.benvenuto@mongodb.com> | 2020-02-26 22:58:46 -0500 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-27 19:23:39 +0000 |
commit | ff724b466d7bc7ead68eacd5524cc1185b8b4523 (patch) | |
tree | ab550e052883eb26ad7321663cb2f6066e43ce28 /src/mongo/logger | |
parent | 9a421e19cef1caa2627d4776db700ae5c8751932 (diff) | |
download | mongo-ff724b466d7bc7ead68eacd5524cc1185b8b4523.tar.gz |
SERVER-46405 Remove {get,set,clear}MinimumLoggedSeverity from logger V1 API
Diffstat (limited to 'src/mongo/logger')
-rw-r--r-- | src/mongo/logger/log_component_settings_test.cpp | 1 | ||||
-rw-r--r-- | src/mongo/logger/log_test.h | 47 |
2 files changed, 48 insertions, 0 deletions
diff --git a/src/mongo/logger/log_component_settings_test.cpp b/src/mongo/logger/log_component_settings_test.cpp index d5a2541d81b..d1b02379752 100644 --- a/src/mongo/logger/log_component_settings_test.cpp +++ b/src/mongo/logger/log_component_settings_test.cpp @@ -31,6 +31,7 @@ #include "mongo/logger/log_component.h" #include "mongo/logger/log_component_settings.h" +#include "mongo/logger/log_test.h" #include "mongo/logger/logger.h" #include "mongo/platform/atomic_word.h" #include "mongo/stdx/thread.h" diff --git a/src/mongo/logger/log_test.h b/src/mongo/logger/log_test.h index 72c4a12b00f..3fd731a437c 100644 --- a/src/mongo/logger/log_test.h +++ b/src/mongo/logger/log_test.h @@ -49,8 +49,55 @@ #include "mongo/util/log_global_settings.h" namespace mongo { + +inline logger::LogSeverity getMinimumLogSeverity() { + if (logV2Enabled()) + return logSeverityV2toV1( + logv2::LogManager::global().getGlobalSettings().getMinimumLogSeverity( + mongo::logv2::LogComponent::kDefault)); + return logger::globalLogDomain()->getMinimumLogSeverity(); +} + +inline logger::LogSeverity getMinimumLogSeverity(logger::LogComponent component) { + if (logV2Enabled()) + return logSeverityV2toV1( + logv2::LogManager::global().getGlobalSettings().getMinimumLogSeverity( + logComponentV1toV2(component))); + return logger::globalLogDomain()->getMinimumLogSeverity(component); +} + +inline void setMinimumLoggedSeverity(logger::LogSeverity severity) { + if (logV2Enabled()) + return logv2::LogManager::global().getGlobalSettings().setMinimumLoggedSeverity( + mongo::logv2::LogComponent::kDefault, mongo::logSeverityV1toV2(severity)); + logger::globalLogDomain()->setMinimumLoggedSeverity(severity); +} + +inline void setMinimumLoggedSeverity(logger::LogComponent component, logger::LogSeverity severity) { + if (logV2Enabled()) + return logv2::LogManager::global().getGlobalSettings().setMinimumLoggedSeverity( + logComponentV1toV2(component), mongo::logSeverityV1toV2(severity)); + logger::globalLogDomain()->setMinimumLoggedSeverity(component, severity); +} + +inline void clearMinimumLoggedSeverity(logger::LogComponent component) { + if (logV2Enabled()) + return logv2::LogManager::global().getGlobalSettings().clearMinimumLoggedSeverity( + logComponentV1toV2(component)); + logger::globalLogDomain()->clearMinimumLoggedSeverity(component); +} + +inline bool hasMinimumLogSeverity(logger::LogComponent component) { + if (logV2Enabled()) + return logv2::LogManager::global().getGlobalSettings().hasMinimumLogSeverity( + logComponentV1toV2(component)); + return logger::globalLogDomain()->hasMinimumLogSeverity(component); +} + + namespace logger { + // Used for testing logging framework only. // TODO(schwerin): Have logger write to a different log from the global log, so that tests can // redirect their global log output for examination. |