summaryrefslogtreecommitdiff
path: root/src/mongo/db
diff options
context:
space:
mode:
authorHenrik Edin <henrik.edin@mongodb.com>2020-03-05 14:13:03 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-03-10 19:23:52 +0000
commit45eab9f82a18613b877598a951dc7b95f85f2059 (patch)
tree45ebe031ec8de64d98fd4fc44b9ad60f2b148211 /src/mongo/db
parent3848ef2467665a7c7756eb19b42cb0f523c03535 (diff)
downloadmongo-45eab9f82a18613b877598a951dc7b95f85f2059.tar.gz
SERVER-46585 Move redact to logv2
Diffstat (limited to 'src/mongo/db')
-rw-r--r--src/mongo/db/catalog/create_collection.cpp1
-rw-r--r--src/mongo/db/catalog/index_build_oplog_entry.cpp2
-rw-r--r--src/mongo/db/catalog/multi_index_block.cpp1
-rw-r--r--src/mongo/db/exec/working_set_common.cpp1
-rw-r--r--src/mongo/db/ops/write_ops_retryability.cpp2
-rw-r--r--src/mongo/db/pipeline/document_source_internal_shard_filter.cpp1
-rw-r--r--src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp2
-rw-r--r--src/mongo/db/query/query_planner_common.cpp2
-rw-r--r--src/mongo/db/repl/oplog_entry.cpp2
-rw-r--r--src/mongo/db/s/session_catalog_migration_destination.cpp2
-rw-r--r--src/mongo/db/service_entry_point_mongod.cpp1
-rw-r--r--src/mongo/db/transaction_history_iterator.cpp2
12 files changed, 7 insertions, 12 deletions
diff --git a/src/mongo/db/catalog/create_collection.cpp b/src/mongo/db/catalog/create_collection.cpp
index ebb298b22e4..f2f8d7b516b 100644
--- a/src/mongo/db/catalog/create_collection.cpp
+++ b/src/mongo/db/catalog/create_collection.cpp
@@ -47,7 +47,6 @@
#include "mongo/db/ops/insert.h"
#include "mongo/db/repl/replication_coordinator.h"
#include "mongo/db/views/view_catalog.h"
-#include "mongo/logger/redaction.h"
#include "mongo/logv2/log.h"
namespace mongo {
diff --git a/src/mongo/db/catalog/index_build_oplog_entry.cpp b/src/mongo/db/catalog/index_build_oplog_entry.cpp
index a89cd0ce6ea..b37d274be40 100644
--- a/src/mongo/db/catalog/index_build_oplog_entry.cpp
+++ b/src/mongo/db/catalog/index_build_oplog_entry.cpp
@@ -32,7 +32,7 @@
#include "mongo/db/catalog/index_build_oplog_entry.h"
#include "mongo/bson/util/bson_extract.h"
-#include "mongo/logger/redaction.h"
+#include "mongo/logv2/redaction.h"
#include "mongo/rpc/get_status_from_command_result.h"
namespace mongo {
diff --git a/src/mongo/db/catalog/multi_index_block.cpp b/src/mongo/db/catalog/multi_index_block.cpp
index 7c2cf1c2d9c..f96bb31d426 100644
--- a/src/mongo/db/catalog/multi_index_block.cpp
+++ b/src/mongo/db/catalog/multi_index_block.cpp
@@ -53,7 +53,6 @@
#include "mongo/db/storage/durable_catalog.h"
#include "mongo/db/storage/storage_options.h"
#include "mongo/db/storage/write_unit_of_work.h"
-#include "mongo/logger/redaction.h"
#include "mongo/logv2/log.h"
#include "mongo/util/assert_util.h"
#include "mongo/util/fail_point.h"
diff --git a/src/mongo/db/exec/working_set_common.cpp b/src/mongo/db/exec/working_set_common.cpp
index 3e2670ca7b4..f80d3a275e6 100644
--- a/src/mongo/db/exec/working_set_common.cpp
+++ b/src/mongo/db/exec/working_set_common.cpp
@@ -41,7 +41,6 @@
#include "mongo/db/index/index_access_method.h"
#include "mongo/db/query/canonical_query.h"
#include "mongo/db/service_context.h"
-#include "mongo/logger/redaction.h"
#include "mongo/logv2/log.h"
namespace mongo {
diff --git a/src/mongo/db/ops/write_ops_retryability.cpp b/src/mongo/db/ops/write_ops_retryability.cpp
index 866385c73fe..57e872fdb39 100644
--- a/src/mongo/db/ops/write_ops_retryability.cpp
+++ b/src/mongo/db/ops/write_ops_retryability.cpp
@@ -35,7 +35,7 @@
#include "mongo/db/namespace_string.h"
#include "mongo/db/ops/find_and_modify_result.h"
#include "mongo/db/query/find_and_modify_request.h"
-#include "mongo/logger/redaction.h"
+#include "mongo/logv2/redaction.h"
namespace mongo {
namespace {
diff --git a/src/mongo/db/pipeline/document_source_internal_shard_filter.cpp b/src/mongo/db/pipeline/document_source_internal_shard_filter.cpp
index cb10a68d1c1..0c52aeaaefc 100644
--- a/src/mongo/db/pipeline/document_source_internal_shard_filter.cpp
+++ b/src/mongo/db/pipeline/document_source_internal_shard_filter.cpp
@@ -34,7 +34,6 @@
#include "mongo/db/pipeline/document_source_internal_shard_filter.h"
#include "mongo/db/exec/document_value/document.h"
-#include "mongo/logger/redaction.h"
#include "mongo/logv2/log.h"
namespace mongo {
diff --git a/src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp b/src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp
index 6622e0c9ab6..99e1fdd188f 100644
--- a/src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp
+++ b/src/mongo/db/pipeline/process_interface/mongos_process_interface.cpp
@@ -44,7 +44,7 @@
#include "mongo/db/repl/read_concern_args.h"
#include "mongo/db/s/scoped_collection_metadata.h"
#include "mongo/executor/task_executor_pool.h"
-#include "mongo/logger/redaction.h"
+#include "mongo/logv2/redaction.h"
#include "mongo/s/catalog_cache.h"
#include "mongo/s/cluster_commands_helpers.h"
#include "mongo/s/grid.h"
diff --git a/src/mongo/db/query/query_planner_common.cpp b/src/mongo/db/query/query_planner_common.cpp
index 34c62f1b1d0..78f9ca47311 100644
--- a/src/mongo/db/query/query_planner_common.cpp
+++ b/src/mongo/db/query/query_planner_common.cpp
@@ -35,7 +35,7 @@
#include "mongo/db/query/projection_ast_path_tracking_visitor.h"
#include "mongo/db/query/projection_ast_walker.h"
#include "mongo/db/query/query_planner_common.h"
-#include "mongo/logger/redaction.h"
+#include "mongo/logv2/redaction.h"
#include "mongo/util/assert_util.h"
diff --git a/src/mongo/db/repl/oplog_entry.cpp b/src/mongo/db/repl/oplog_entry.cpp
index 980630a3579..f1ff3aecd66 100644
--- a/src/mongo/db/repl/oplog_entry.cpp
+++ b/src/mongo/db/repl/oplog_entry.cpp
@@ -35,7 +35,7 @@
#include "mongo/db/index/index_descriptor.h"
#include "mongo/db/namespace_string.h"
-#include "mongo/logger/redaction.h"
+#include "mongo/logv2/redaction.h"
#include "mongo/util/time_support.h"
namespace mongo {
diff --git a/src/mongo/db/s/session_catalog_migration_destination.cpp b/src/mongo/db/s/session_catalog_migration_destination.cpp
index 58f16e91711..2ae622b4e51 100644
--- a/src/mongo/db/s/session_catalog_migration_destination.cpp
+++ b/src/mongo/db/s/session_catalog_migration_destination.cpp
@@ -46,7 +46,7 @@
#include "mongo/db/session_catalog_mongod.h"
#include "mongo/db/transaction_participant.h"
#include "mongo/db/write_concern.h"
-#include "mongo/logger/redaction.h"
+#include "mongo/logv2/redaction.h"
#include "mongo/s/client/shard_registry.h"
#include "mongo/s/grid.h"
#include "mongo/s/shard_id.h"
diff --git a/src/mongo/db/service_entry_point_mongod.cpp b/src/mongo/db/service_entry_point_mongod.cpp
index 0057d138926..7025c6ba8ff 100644
--- a/src/mongo/db/service_entry_point_mongod.cpp
+++ b/src/mongo/db/service_entry_point_mongod.cpp
@@ -46,7 +46,6 @@
#include "mongo/db/s/sharding_config_optime_gossip.h"
#include "mongo/db/s/sharding_state.h"
#include "mongo/db/service_entry_point_common.h"
-#include "mongo/logger/redaction.h"
#include "mongo/logv2/log.h"
#include "mongo/rpc/get_status_from_command_result.h"
#include "mongo/rpc/metadata/config_server_metadata.h"
diff --git a/src/mongo/db/transaction_history_iterator.cpp b/src/mongo/db/transaction_history_iterator.cpp
index ceca114d322..d3bff7fb807 100644
--- a/src/mongo/db/transaction_history_iterator.cpp
+++ b/src/mongo/db/transaction_history_iterator.cpp
@@ -39,7 +39,7 @@
#include "mongo/db/repl/local_oplog_info.h"
#include "mongo/db/repl/oplog_entry.h"
#include "mongo/db/transaction_history_iterator.h"
-#include "mongo/logger/redaction.h"
+#include "mongo/logv2/redaction.h"
#include "mongo/util/str.h"
namespace mongo {