diff options
author | Billy Donahue <billy.donahue@mongodb.com> | 2020-04-25 12:23:19 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-04-26 23:06:52 +0000 |
commit | eae31861e0f813f0099e1d490c4a622d75cd5a08 (patch) | |
tree | bcfeb9feeb3bc37ccb1eb3250eca2f91e4bb8523 /src/mongo/transport | |
parent | 085ffeb310e8fed49739cf8443fcb13ea795d867 (diff) | |
download | mongo-eae31861e0f813f0099e1d490c4a622d75cd5a08.tar.gz |
SERVER-47735 change mongo source over to logv2
- Remove several legacy logger/ files
- Convert all MONGO_LOG_DEFAULT_COMPONENT to the LOGV2 version.
- Globally replace logger::{LogSeverity,LogComponent} => logv2::
Diffstat (limited to 'src/mongo/transport')
-rw-r--r-- | src/mongo/transport/ismaster_metrics.cpp | 2 | ||||
-rw-r--r-- | src/mongo/transport/message_compressor_manager.cpp | 2 | ||||
-rw-r--r-- | src/mongo/transport/message_compressor_snappy.cpp | 2 | ||||
-rw-r--r-- | src/mongo/transport/message_compressor_zlib.cpp | 2 | ||||
-rw-r--r-- | src/mongo/transport/message_compressor_zstd.cpp | 2 | ||||
-rw-r--r-- | src/mongo/transport/service_entry_point_impl.cpp | 24 | ||||
-rw-r--r-- | src/mongo/transport/service_entry_point_utils.cpp | 2 | ||||
-rw-r--r-- | src/mongo/transport/service_executor_adaptive.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_state_machine.cpp | 4 | ||||
-rw-r--r-- | src/mongo/transport/transport_layer_asio.cpp | 2 | ||||
-rw-r--r-- | src/mongo/transport/transport_layer_egress_init.cpp | 2 |
13 files changed, 23 insertions, 27 deletions
diff --git a/src/mongo/transport/ismaster_metrics.cpp b/src/mongo/transport/ismaster_metrics.cpp index dc1a2b68dda..98e772ebfb7 100644 --- a/src/mongo/transport/ismaster_metrics.cpp +++ b/src/mongo/transport/ismaster_metrics.cpp @@ -26,7 +26,7 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork +#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kNetwork #include "mongo/transport/ismaster_metrics.h" namespace mongo { diff --git a/src/mongo/transport/message_compressor_manager.cpp b/src/mongo/transport/message_compressor_manager.cpp index 1214149832e..1341a4323f0 100644 --- a/src/mongo/transport/message_compressor_manager.cpp +++ b/src/mongo/transport/message_compressor_manager.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork +#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kNetwork #include "mongo/platform/basic.h" diff --git a/src/mongo/transport/message_compressor_snappy.cpp b/src/mongo/transport/message_compressor_snappy.cpp index 58712aee596..5b5c7852306 100644 --- a/src/mongo/transport/message_compressor_snappy.cpp +++ b/src/mongo/transport/message_compressor_snappy.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork +#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kNetwork #include "mongo/platform/basic.h" diff --git a/src/mongo/transport/message_compressor_zlib.cpp b/src/mongo/transport/message_compressor_zlib.cpp index 8676c03eacc..a5eb13a3389 100644 --- a/src/mongo/transport/message_compressor_zlib.cpp +++ b/src/mongo/transport/message_compressor_zlib.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork +#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kNetwork #include "mongo/platform/basic.h" diff --git a/src/mongo/transport/message_compressor_zstd.cpp b/src/mongo/transport/message_compressor_zstd.cpp index b98b4835fba..4699f5748ff 100644 --- a/src/mongo/transport/message_compressor_zstd.cpp +++ b/src/mongo/transport/message_compressor_zstd.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork +#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kNetwork #include "mongo/platform/basic.h" diff --git a/src/mongo/transport/service_entry_point_impl.cpp b/src/mongo/transport/service_entry_point_impl.cpp index 011d65ea919..db8cec48516 100644 --- a/src/mongo/transport/service_entry_point_impl.cpp +++ b/src/mongo/transport/service_entry_point_impl.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork +#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kNetwork #include "mongo/platform/basic.h" @@ -216,7 +216,7 @@ void ServiceEntryPointImpl::endAllSessions(transport::Session::TagMask tags) { } bool ServiceEntryPointImpl::shutdown(Milliseconds timeout) { - using logger::LogComponent; + using logv2::LogComponent; stdx::unique_lock<decltype(_sessionsMutex)> lk(_sessionsMutex); @@ -236,24 +236,20 @@ bool ServiceEntryPointImpl::shutdown(Milliseconds timeout) { auto noWorkersLeft = [this] { return numOpenSessions() == 0; }; while (timeSpent < timeout && !_shutdownCondition.wait_for(lk, checkInterval.toSystemDuration(), noWorkersLeft)) { - LOGV2_OPTIONS(22945, - {logComponentV1toV2(LogComponent::kNetwork)}, - "shutdown: still waiting on {numOpenSessions} active workers to drain... ", - "numOpenSessions"_attr = numOpenSessions()); + LOGV2(22945, + "shutdown: still waiting on {numOpenSessions} active workers to drain... ", + "numOpenSessions"_attr = numOpenSessions()); timeSpent += checkInterval; } bool result = noWorkersLeft(); if (result) { - LOGV2_OPTIONS(22946, - {logComponentV1toV2(LogComponent::kNetwork)}, - "shutdown: no running workers found..."); + LOGV2(22946, "shutdown: no running workers found..."); } else { - LOGV2_OPTIONS(22947, - {logComponentV1toV2(LogComponent::kNetwork)}, - "shutdown: exhausted grace period for{numOpenSessions} active workers to " - "drain; continuing with shutdown... ", - "numOpenSessions"_attr = numOpenSessions()); + LOGV2(22947, + "shutdown: exhausted grace period for{numOpenSessions} active workers to " + "drain; continuing with shutdown... ", + "numOpenSessions"_attr = numOpenSessions()); } return result; } diff --git a/src/mongo/transport/service_entry_point_utils.cpp b/src/mongo/transport/service_entry_point_utils.cpp index aab92e246c3..f1955f31715 100644 --- a/src/mongo/transport/service_entry_point_utils.cpp +++ b/src/mongo/transport/service_entry_point_utils.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault +#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::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 6b6bb17885e..3fa82fcb293 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_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kExecutor #include "mongo/platform/basic.h" diff --git a/src/mongo/transport/service_executor_reserved.cpp b/src/mongo/transport/service_executor_reserved.cpp index fffd3d5a935..1107a61a99f 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_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::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 f0c991d5564..972f8004f44 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_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kExecutor #include "mongo/platform/basic.h" diff --git a/src/mongo/transport/service_state_machine.cpp b/src/mongo/transport/service_state_machine.cpp index 2f4e77ac0fc..d66547faad5 100644 --- a/src/mongo/transport/service_state_machine.cpp +++ b/src/mongo/transport/service_state_machine.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork +#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kNetwork #include "mongo/platform/basic.h" @@ -648,7 +648,7 @@ ServiceStateMachine::State ServiceStateMachine::state() { void ServiceStateMachine::_terminateAndLogIfError(Status status) { if (!status.isOK()) { LOGV2_WARNING_OPTIONS(22993, - {logComponentV1toV2(logger::LogComponent::kExecutor)}, + {logv2::LogComponent::kExecutor}, "Terminating session due to error: {status}", "status"_attr = status); terminate(); diff --git a/src/mongo/transport/transport_layer_asio.cpp b/src/mongo/transport/transport_layer_asio.cpp index daa753adabf..9f0747fd488 100644 --- a/src/mongo/transport/transport_layer_asio.cpp +++ b/src/mongo/transport/transport_layer_asio.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kNetwork +#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kNetwork #include "mongo/platform/basic.h" diff --git a/src/mongo/transport/transport_layer_egress_init.cpp b/src/mongo/transport/transport_layer_egress_init.cpp index 8be5bd39735..7c8cf66cbb3 100644 --- a/src/mongo/transport/transport_layer_egress_init.cpp +++ b/src/mongo/transport/transport_layer_egress_init.cpp @@ -27,7 +27,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kDefault +#define MONGO_LOGV2_DEFAULT_COMPONENT ::mongo::logv2::LogComponent::kDefault #include "mongo/platform/basic.h" |