diff options
author | Gabriel Russell <gabriel.russell@mongodb.com> | 2020-02-20 16:05:48 -0500 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-02-21 20:12:44 +0000 |
commit | 0f7625b5cdbc24ed0fce1e168059118cb025d869 (patch) | |
tree | 3ea90b71ed2510e220140626b351f6e998d2d8b7 /src/mongo/db/ftdc | |
parent | 3463ea25afcbf2c07b96f043904961b5c0f04474 (diff) | |
download | mongo-0f7625b5cdbc24ed0fce1e168059118cb025d869.tar.gz |
SERVER-45567 removing util/log.h where I can
o converting some log lines that were missed
o fixing some missing includes
create mode 100644 src/mongo/transport/ismaster_metrics.cpp
Diffstat (limited to 'src/mongo/db/ftdc')
-rw-r--r-- | src/mongo/db/ftdc/controller.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/ftdc/file_manager.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/ftdc/file_manager_test.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/ftdc/file_writer.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/ftdc/ftdc_mongos.cpp | 7 | ||||
-rw-r--r-- | src/mongo/db/ftdc/ftdc_system_stats_windows.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/ftdc/util.cpp | 1 |
7 files changed, 4 insertions, 9 deletions
diff --git a/src/mongo/db/ftdc/controller.cpp b/src/mongo/db/ftdc/controller.cpp index 47acae27edf..6da89b00104 100644 --- a/src/mongo/db/ftdc/controller.cpp +++ b/src/mongo/db/ftdc/controller.cpp @@ -45,7 +45,6 @@ #include "mongo/stdx/thread.h" #include "mongo/util/concurrency/idle_thread_block.h" #include "mongo/util/exit.h" -#include "mongo/util/log.h" #include "mongo/util/time_support.h" namespace mongo { diff --git a/src/mongo/db/ftdc/file_manager.cpp b/src/mongo/db/ftdc/file_manager.cpp index 783e9793c55..dbe83579f4b 100644 --- a/src/mongo/db/ftdc/file_manager.cpp +++ b/src/mongo/db/ftdc/file_manager.cpp @@ -45,7 +45,6 @@ #include "mongo/db/jsobj.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" -#include "mongo/util/log.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" diff --git a/src/mongo/db/ftdc/file_manager_test.cpp b/src/mongo/db/ftdc/file_manager_test.cpp index c8fba1ddd2c..0f48f795973 100644 --- a/src/mongo/db/ftdc/file_manager_test.cpp +++ b/src/mongo/db/ftdc/file_manager_test.cpp @@ -51,7 +51,6 @@ #include "mongo/logv2/log.h" #include "mongo/unittest/temp_dir.h" #include "mongo/unittest/unittest.h" -#include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/ftdc/file_writer.cpp b/src/mongo/db/ftdc/file_writer.cpp index 24a6bf4cb17..3eaded126d2 100644 --- a/src/mongo/db/ftdc/file_writer.cpp +++ b/src/mongo/db/ftdc/file_writer.cpp @@ -43,7 +43,6 @@ #include "mongo/db/ftdc/util.h" #include "mongo/db/jsobj.h" #include "mongo/util/assert_util.h" -#include "mongo/util/log.h" namespace mongo { diff --git a/src/mongo/db/ftdc/ftdc_mongos.cpp b/src/mongo/db/ftdc/ftdc_mongos.cpp index e45c8031d6e..1eb5015bb8f 100644 --- a/src/mongo/db/ftdc/ftdc_mongos.cpp +++ b/src/mongo/db/ftdc/ftdc_mongos.cpp @@ -42,9 +42,9 @@ #include "mongo/db/repl/replication_coordinator.h" #include "mongo/executor/connection_pool_stats.h" #include "mongo/executor/task_executor_pool.h" +#include "mongo/logv2/log.h" #include "mongo/s/grid.h" #include "mongo/stdx/thread.h" -#include "mongo/util/log.h" #include "mongo/util/synchronized_value.h" namespace mongo { @@ -108,8 +108,9 @@ void startMongoSFTDC() { if (directory.empty()) { if (serverGlobalParams.logpath.empty()) { - warning() << "FTDC is disabled because neither '--logpath' nor set parameter " - "'diagnosticDataCollectionDirectoryPath' are specified."; + LOGV2_WARNING(23911, + "FTDC is disabled because neither '--logpath' nor set parameter " + "'diagnosticDataCollectionDirectoryPath' are specified."); startMode = FTDCStartMode::kSkipStart; } else { directory = boost::filesystem::absolute( diff --git a/src/mongo/db/ftdc/ftdc_system_stats_windows.cpp b/src/mongo/db/ftdc/ftdc_system_stats_windows.cpp index cf2ac6a4e61..7b923f2465d 100644 --- a/src/mongo/db/ftdc/ftdc_system_stats_windows.cpp +++ b/src/mongo/db/ftdc/ftdc_system_stats_windows.cpp @@ -43,7 +43,6 @@ #include "mongo/db/ftdc/collector.h" #include "mongo/db/ftdc/controller.h" #include "mongo/logv2/log.h" -#include "mongo/util/log.h" #include "mongo/util/perfctr_collect.h" namespace mongo { diff --git a/src/mongo/db/ftdc/util.cpp b/src/mongo/db/ftdc/util.cpp index a1442ec8b6f..9a9c6a7cc8a 100644 --- a/src/mongo/db/ftdc/util.cpp +++ b/src/mongo/db/ftdc/util.cpp @@ -44,7 +44,6 @@ #include "mongo/db/service_context.h" #include "mongo/logv2/log.h" #include "mongo/util/assert_util.h" -#include "mongo/util/log.h" #include "mongo/util/str.h" #include "mongo/util/time_support.h" |