diff options
-rw-r--r-- | src/mongo/db/commands/write_commands/batch_executor.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/concurrency/write_conflict_exception.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/exec/delete.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/exec/update.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/instance.cpp | 4 | ||||
-rw-r--r-- | src/mongo/db/ops/delete_executor.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/ops/update.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/ops/update_executor.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/ops/update_result.cpp | 2 | ||||
-rw-r--r-- | src/mongo/logger/log_component.cpp | 4 | ||||
-rw-r--r-- | src/mongo/logger/log_component.h | 2 |
11 files changed, 13 insertions, 13 deletions
diff --git a/src/mongo/db/commands/write_commands/batch_executor.cpp b/src/mongo/db/commands/write_commands/batch_executor.cpp index be69c96cb9a..b24b6e72b5a 100644 --- a/src/mongo/db/commands/write_commands/batch_executor.cpp +++ b/src/mongo/db/commands/write_commands/batch_executor.cpp @@ -26,7 +26,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrites +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrite #include "mongo/platform/basic.h" diff --git a/src/mongo/db/concurrency/write_conflict_exception.cpp b/src/mongo/db/concurrency/write_conflict_exception.cpp index d2a51b00338..7870a721056 100644 --- a/src/mongo/db/concurrency/write_conflict_exception.cpp +++ b/src/mongo/db/concurrency/write_conflict_exception.cpp @@ -28,7 +28,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrites +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrite #include "mongo/db/concurrency/write_conflict_exception.h" #include "mongo/util/log.h" diff --git a/src/mongo/db/exec/delete.cpp b/src/mongo/db/exec/delete.cpp index 8e1d476ea8d..fb24f9ec29c 100644 --- a/src/mongo/db/exec/delete.cpp +++ b/src/mongo/db/exec/delete.cpp @@ -26,7 +26,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrites +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrite #include "mongo/platform/basic.h" diff --git a/src/mongo/db/exec/update.cpp b/src/mongo/db/exec/update.cpp index 1c5c8ed4011..106c9406711 100644 --- a/src/mongo/db/exec/update.cpp +++ b/src/mongo/db/exec/update.cpp @@ -26,7 +26,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrites +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrite #include "mongo/platform/basic.h" diff --git a/src/mongo/db/instance.cpp b/src/mongo/db/instance.cpp index df97826e625..64d55a656e0 100644 --- a/src/mongo/db/instance.cpp +++ b/src/mongo/db/instance.cpp @@ -99,7 +99,7 @@ namespace { case dbInsert: case dbUpdate: case dbDelete: - return LogComponent::kWrites; + return LogComponent::kWrite; default: return LogComponent::kQuery; } @@ -593,7 +593,7 @@ namespace { } catch ( const WriteConflictException& dle ) { if ( multi ) { - log(LogComponent::kWrites) << "Had WriteConflict during multi update, aborting"; + log(LogComponent::kWrite) << "Had WriteConflict during multi update, aborting"; throw; } WriteConflictException::logAndBackoff( attempt++, "update", ns.toString() ); diff --git a/src/mongo/db/ops/delete_executor.cpp b/src/mongo/db/ops/delete_executor.cpp index 655babffb1c..0fb966ef64e 100644 --- a/src/mongo/db/ops/delete_executor.cpp +++ b/src/mongo/db/ops/delete_executor.cpp @@ -26,7 +26,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrites +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrite #include "mongo/platform/basic.h" diff --git a/src/mongo/db/ops/update.cpp b/src/mongo/db/ops/update.cpp index aa7d41c1be8..ceb8af65297 100644 --- a/src/mongo/db/ops/update.cpp +++ b/src/mongo/db/ops/update.cpp @@ -28,7 +28,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrites +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrite #include "mongo/platform/basic.h" diff --git a/src/mongo/db/ops/update_executor.cpp b/src/mongo/db/ops/update_executor.cpp index cd9ea94dd80..1cb67364364 100644 --- a/src/mongo/db/ops/update_executor.cpp +++ b/src/mongo/db/ops/update_executor.cpp @@ -26,7 +26,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrites +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrite #include "mongo/platform/basic.h" diff --git a/src/mongo/db/ops/update_result.cpp b/src/mongo/db/ops/update_result.cpp index bcbe22a0312..f5e31c1a3d8 100644 --- a/src/mongo/db/ops/update_result.cpp +++ b/src/mongo/db/ops/update_result.cpp @@ -28,7 +28,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrites +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kWrite #include "mongo/platform/basic.h" diff --git a/src/mongo/logger/log_component.cpp b/src/mongo/logger/log_component.cpp index 6583136dba6..63bf64be0cc 100644 --- a/src/mongo/logger/log_component.cpp +++ b/src/mongo/logger/log_component.cpp @@ -102,7 +102,7 @@ std::string _dottedNames[LogComponent::kNumLogComponents+1]; case kSharding: return createStringData("sharding"); case kStorage: return createStringData("storage"); case kJournal: return createStringData("journal"); - case kWrites: return createStringData("write"); + case kWrite: return createStringData("write"); case kNumLogComponents: return createStringData("total"); // No default. Compiler should complain if there's a log component that's not handled. } @@ -147,7 +147,7 @@ std::string _dottedNames[LogComponent::kNumLogComponents+1]; case kSharding: return createStringData("SHARDING"); case kStorage: return createStringData("STORAGE "); case kJournal: return createStringData("JOURNAL "); - case kWrites: return createStringData("WRITE "); + case kWrite: return createStringData("WRITE "); case kNumLogComponents: return createStringData("TOTAL "); // No default. Compiler should complain if there's a log component that's not handled. } diff --git a/src/mongo/logger/log_component.h b/src/mongo/logger/log_component.h index 655ac05f1a2..5ccd9ada003 100644 --- a/src/mongo/logger/log_component.h +++ b/src/mongo/logger/log_component.h @@ -55,7 +55,7 @@ namespace logger { kSharding, kStorage, kJournal, - kWrites, + kWrite, kNumLogComponents }; |