diff options
author | Gabriel Russell <gabriel.russell@mongodb.com> | 2020-01-24 19:50:46 +0000 |
---|---|---|
committer | evergreen <evergreen@mongodb.com> | 2020-01-24 19:50:46 +0000 |
commit | fa1edf200322386eb5b7f64de6de2d163923a321 (patch) | |
tree | d3cbd02af76782fee962f201a65ace817c51634d | |
parent | 544cd7662f2d8ba2d4067d5bc0f960c07ff40ce4 (diff) | |
download | mongo-fa1edf200322386eb5b7f64de6de2d163923a321.tar.gz |
SERVER-445566 legacy logging cleanups
-rw-r--r-- | src/mongo/db/auth/user_cache_invalidator_job.cpp | 8 | ||||
-rw-r--r-- | src/mongo/logger/log_version_util.h | 5 | ||||
-rw-r--r-- | src/mongo/logv2/log.h | 21 | ||||
-rw-r--r-- | src/mongo/logv2/log_detail.h | 2 | ||||
-rw-r--r-- | src/mongo/shell/shell_options.cpp | 2 | ||||
-rw-r--r-- | src/mongo/transport/service_executor_adaptive.cpp | 2 | ||||
-rw-r--r-- | src/mongo/transport/service_executor_adaptive_test.cpp | 2 | ||||
-rw-r--r-- | src/mongo/transport/service_executor_reserved.cpp | 2 | ||||
-rw-r--r-- | src/mongo/transport/service_executor_synchronous.cpp | 2 | ||||
-rw-r--r-- | src/mongo/transport/service_executor_test.cpp | 2 | ||||
-rw-r--r-- | src/mongo/util/exit.cpp | 2 |
11 files changed, 31 insertions, 19 deletions
diff --git a/src/mongo/db/auth/user_cache_invalidator_job.cpp b/src/mongo/db/auth/user_cache_invalidator_job.cpp index b483b8e4d46..771194c14c6 100644 --- a/src/mongo/db/auth/user_cache_invalidator_job.cpp +++ b/src/mongo/db/auth/user_cache_invalidator_job.cpp @@ -63,7 +63,7 @@ public: void setInterval(Seconds interval) { { stdx::lock_guard<Latch> twiddle(_mutex); - MONGO_LOG(5) << "setInterval: old=" << _interval << ", new=" << interval; + LOG(5) << "setInterval: old=" << _interval << ", new=" << interval; _interval = interval; } _condition.notify_all(); @@ -94,15 +94,15 @@ public: Date_t now = Date_t::now(); Date_t expiry = _last + _interval; - MONGO_LOG(5) << "wait: now=" << now << ", expiry=" << expiry; + LOG(5) << "wait: now=" << now << ", expiry=" << expiry; if (now >= expiry) { _last = now; - MONGO_LOG(5) << "wait: done"; + LOG(5) << "wait: done"; return true; } - MONGO_LOG(5) << "wait: blocking"; + LOG(5) << "wait: blocking"; MONGO_IDLE_THREAD_BLOCK; _condition.wait_until(lock, expiry.toSystemTimePoint()); } diff --git a/src/mongo/logger/log_version_util.h b/src/mongo/logger/log_version_util.h index ba60ba37477..1da0f302e8d 100644 --- a/src/mongo/logger/log_version_util.h +++ b/src/mongo/logger/log_version_util.h @@ -48,7 +48,10 @@ inline logger::LogComponent logComponentV2toV1(logv2::LogComponent component) { inline logv2::LogSeverity logSeverityV1toV2(logger::LogSeverity severity) { return logv2::LogSeverity::cast(severity.toInt()); } +inline logv2::LogSeverity logSeverityV1toV2(int severity) { + return logv2::LogSeverity::cast(severity); +} inline logger::LogSeverity logSeverityV2toV1(logv2::LogSeverity severity) { return logger::LogSeverity::cast(severity.toInt()); } -} // namespace mongo
\ No newline at end of file +} // namespace mongo diff --git a/src/mongo/logv2/log.h b/src/mongo/logv2/log.h index 308874b482a..cb0dc26b58a 100644 --- a/src/mongo/logv2/log.h +++ b/src/mongo/logv2/log.h @@ -46,6 +46,7 @@ #include "mongo/base/status.h" #include "mongo/bson/util/builder.h" +#include "mongo/logger/log_version_util.h" #include "mongo/logv2/log_component.h" #include "mongo/logv2/log_domain.h" #include "mongo/logv2/log_severity.h" @@ -53,6 +54,12 @@ // Provide log component in global scope so that MONGO_LOG will always have a valid component. // Global log component will be kDefault unless overridden by MONGO_LOGV2_DEFAULT_COMPONENT. +#if !defined(MONGO_LOGV2_DEFAULT_COMPONENT) +#if defined(MONGO_LOG_DEFAULT_COMPONENT) +#define MONGO_LOGV2_DEFAULT_COMPONENT mongo::logComponentV1toV2(MONGO_LOG_DEFAULT_COMPONENT) +#endif +#endif + #if defined(MONGO_LOGV2_DEFAULT_COMPONENT) const ::mongo::logv2::LogComponent MongoLogV2DefaultComponent_component = MONGO_LOGV2_DEFAULT_COMPONENT; @@ -121,13 +128,13 @@ namespace mongo { #define LOGV2_FATAL_OPTIONS(ID, OPTIONS, MESSAGE, ...) \ LOGV2_IMPL(ID, ::mongo::logv2::LogSeverity::Severe(), OPTIONS, MESSAGE, ##__VA_ARGS__) -#define LOGV2_DEBUG_OPTIONS(ID, DLEVEL, OPTIONS, MESSAGE, ...) \ - do { \ - auto severity = ::mongo::logv2::LogSeverity::Debug(DLEVEL); \ - if (::mongo::logv2::LogManager::global().getGlobalSettings().shouldLog( \ - MongoLogV2DefaultComponent_component, severity)) { \ - LOGV2_IMPL(ID, severity, OPTIONS, MESSAGE, ##__VA_ARGS__); \ - } \ +#define LOGV2_DEBUG_OPTIONS(ID, DLEVEL, OPTIONS, MESSAGE, ...) \ + do { \ + auto severityMacroLocal_ = ::mongo::logv2::LogSeverity::Debug(DLEVEL); \ + if (::mongo::logv2::LogManager::global().getGlobalSettings().shouldLog( \ + MongoLogV2DefaultComponent_component, severityMacroLocal_)) { \ + LOGV2_IMPL(ID, severityMacroLocal_, OPTIONS, MESSAGE, ##__VA_ARGS__); \ + } \ } while (false) #define LOGV2_DEBUG(ID, DLEVEL, MESSAGE, ...) \ diff --git a/src/mongo/logv2/log_detail.h b/src/mongo/logv2/log_detail.h index 420d4f11bd8..67566eee8f1 100644 --- a/src/mongo/logv2/log_detail.h +++ b/src/mongo/logv2/log_detail.h @@ -27,6 +27,8 @@ * it in the license file. */ +#pragma once + #include "mongo/base/status.h" #include "mongo/bson/util/builder.h" #include "mongo/logv2/attribute_storage.h" diff --git a/src/mongo/shell/shell_options.cpp b/src/mongo/shell/shell_options.cpp index c3b78e95202..dbdc9371f9b 100644 --- a/src/mongo/shell/shell_options.cpp +++ b/src/mongo/shell/shell_options.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault; +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault #include "mongo/platform/basic.h" diff --git a/src/mongo/transport/service_executor_adaptive.cpp b/src/mongo/transport/service_executor_adaptive.cpp index 848ca8eb531..32e8ef9b8b0 100644 --- a/src/mongo/transport/service_executor_adaptive.cpp +++ b/src/mongo/transport/service_executor_adaptive.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kExecutor; +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kExecutor #include "mongo/platform/basic.h" diff --git a/src/mongo/transport/service_executor_adaptive_test.cpp b/src/mongo/transport/service_executor_adaptive_test.cpp index e4abf9f276a..f30679b408b 100644 --- a/src/mongo/transport/service_executor_adaptive_test.cpp +++ b/src/mongo/transport/service_executor_adaptive_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault; +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault #include "mongo/platform/basic.h" diff --git a/src/mongo/transport/service_executor_reserved.cpp b/src/mongo/transport/service_executor_reserved.cpp index 902bf98d7c3..6dba2bafc39 100644 --- a/src/mongo/transport/service_executor_reserved.cpp +++ b/src/mongo/transport/service_executor_reserved.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kExecutor; +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kExecutor #include "mongo/platform/basic.h" diff --git a/src/mongo/transport/service_executor_synchronous.cpp b/src/mongo/transport/service_executor_synchronous.cpp index 25104fd46dd..8fe383768e2 100644 --- a/src/mongo/transport/service_executor_synchronous.cpp +++ b/src/mongo/transport/service_executor_synchronous.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kExecutor; +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kExecutor #include "mongo/platform/basic.h" diff --git a/src/mongo/transport/service_executor_test.cpp b/src/mongo/transport/service_executor_test.cpp index d91cba4fbb7..645752d90d0 100644 --- a/src/mongo/transport/service_executor_test.cpp +++ b/src/mongo/transport/service_executor_test.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault; +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault #include "mongo/platform/basic.h" diff --git a/src/mongo/util/exit.cpp b/src/mongo/util/exit.cpp index d79c9fde1c8..66af99151ff 100644 --- a/src/mongo/util/exit.cpp +++ b/src/mongo/util/exit.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kControl; +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kControl #include "mongo/platform/basic.h" |