diff options
author | Matt Kangas <matt.kangas@mongodb.com> | 2014-11-18 11:49:39 -0500 |
---|---|---|
committer | Matt Kangas <matt.kangas@mongodb.com> | 2014-11-18 17:03:02 -0500 |
commit | 9efe8f1e1d37239cf77e8b5de57bce42dc43e8e1 (patch) | |
tree | ce263885028a2c35d3f224be3cfb065115fc9d9e /src | |
parent | af8fdf9102f60fc731ef64c8ad5cb2b19745dc4e (diff) | |
download | mongo-9efe8f1e1d37239cf77e8b5de57bce42dc43e8e1.tar.gz |
SERVER-16209 LogComponent::kJournaling -> kJournal
Diffstat (limited to 'src')
-rw-r--r-- | src/mongo/db/server_options_test.cpp | 4 | ||||
-rw-r--r-- | src/mongo/db/storage/mmap_v1/dur.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/storage/mmap_v1/dur_journal.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/storage/mmap_v1/dur_recover.cpp | 2 | ||||
-rw-r--r-- | src/mongo/db/storage/mmap_v1/dur_writetodatafiles.cpp | 2 | ||||
-rw-r--r-- | src/mongo/logger/log_component.cpp | 6 | ||||
-rw-r--r-- | src/mongo/logger/log_component.h | 2 | ||||
-rw-r--r-- | src/mongo/logger/log_test.cpp | 2 | ||||
-rw-r--r-- | src/mongo/logger/parse_log_component_settings_test.cpp | 2 |
9 files changed, 12 insertions, 12 deletions
diff --git a/src/mongo/db/server_options_test.cpp b/src/mongo/db/server_options_test.cpp index 254ae283bfb..01570a2a40a 100644 --- a/src/mongo/db/server_options_test.cpp +++ b/src/mongo/db/server_options_test.cpp @@ -410,9 +410,9 @@ namespace { // Journaling - explicitly set to 2 in configuration. ASSERT_TRUE(::mongo::logger::globalLogDomain()->hasMinimumLogSeverity( - ::mongo::logger::LogComponent::kJournaling)); + ::mongo::logger::LogComponent::kJournal)); ASSERT_EQUALS(::mongo::logger::globalLogDomain()->getMinimumLogSeverity( - ::mongo::logger::LogComponent::kJournaling), + ::mongo::logger::LogComponent::kJournal), ::mongo::logger::LogSeverity::Debug(2)); } diff --git a/src/mongo/db/storage/mmap_v1/dur.cpp b/src/mongo/db/storage/mmap_v1/dur.cpp index 74b74fdcc2d..c758cd88d99 100644 --- a/src/mongo/db/storage/mmap_v1/dur.cpp +++ b/src/mongo/db/storage/mmap_v1/dur.cpp @@ -69,7 +69,7 @@ @see https://docs.google.com/drawings/edit?id=1TklsmZzm7ohIZkwgeK6rMvsdaR13KjtJYMsfLr175Zc */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kJournaling +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kJournal #include "mongo/platform/basic.h" diff --git a/src/mongo/db/storage/mmap_v1/dur_journal.cpp b/src/mongo/db/storage/mmap_v1/dur_journal.cpp index 4819d2fc1f6..132b44ec87a 100644 --- a/src/mongo/db/storage/mmap_v1/dur_journal.cpp +++ b/src/mongo/db/storage/mmap_v1/dur_journal.cpp @@ -28,7 +28,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kJournaling +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kJournal #include "mongo/platform/basic.h" diff --git a/src/mongo/db/storage/mmap_v1/dur_recover.cpp b/src/mongo/db/storage/mmap_v1/dur_recover.cpp index 344335c5a79..82642630bbd 100644 --- a/src/mongo/db/storage/mmap_v1/dur_recover.cpp +++ b/src/mongo/db/storage/mmap_v1/dur_recover.cpp @@ -28,7 +28,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kJournaling +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kJournal #include "mongo/platform/basic.h" diff --git a/src/mongo/db/storage/mmap_v1/dur_writetodatafiles.cpp b/src/mongo/db/storage/mmap_v1/dur_writetodatafiles.cpp index 22769a5392b..de690f6d123 100644 --- a/src/mongo/db/storage/mmap_v1/dur_writetodatafiles.cpp +++ b/src/mongo/db/storage/mmap_v1/dur_writetodatafiles.cpp @@ -28,7 +28,7 @@ * it in the license file. */ -#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kJournaling +#define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kJournal #include "mongo/platform/basic.h" diff --git a/src/mongo/logger/log_component.cpp b/src/mongo/logger/log_component.cpp index 2e6c97c2ae9..6583136dba6 100644 --- a/src/mongo/logger/log_component.cpp +++ b/src/mongo/logger/log_component.cpp @@ -81,7 +81,7 @@ std::string _dottedNames[LogComponent::kNumLogComponents+1]; LogComponent LogComponent::parent() const { switch (_value) { case kDefault: return kNumLogComponents; - DECLARE_LOG_COMPONENT_PARENT(kJournaling, kStorage); + DECLARE_LOG_COMPONENT_PARENT(kJournal, kStorage); case kNumLogComponents: return kNumLogComponents; default: return kDefault; } @@ -101,7 +101,7 @@ std::string _dottedNames[LogComponent::kNumLogComponents+1]; case kReplication: return createStringData("replication"); case kSharding: return createStringData("sharding"); case kStorage: return createStringData("storage"); - case kJournaling: return createStringData("journal"); + case kJournal: return createStringData("journal"); case kWrites: return createStringData("write"); case kNumLogComponents: return createStringData("total"); // No default. Compiler should complain if there's a log component that's not handled. @@ -146,7 +146,7 @@ std::string _dottedNames[LogComponent::kNumLogComponents+1]; case kReplication: return createStringData("REPL "); case kSharding: return createStringData("SHARDING"); case kStorage: return createStringData("STORAGE "); - case kJournaling: return createStringData("JOURNAL "); + case kJournal: return createStringData("JOURNAL "); case kWrites: 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 a69831349eb..655ac05f1a2 100644 --- a/src/mongo/logger/log_component.h +++ b/src/mongo/logger/log_component.h @@ -54,7 +54,7 @@ namespace logger { kReplication, kSharding, kStorage, - kJournaling, + kJournal, kWrites, kNumLogComponents }; diff --git a/src/mongo/logger/log_test.cpp b/src/mongo/logger/log_test.cpp index 89ecbf18069..040124c464f 100644 --- a/src/mongo/logger/log_test.cpp +++ b/src/mongo/logger/log_test.cpp @@ -134,7 +134,7 @@ namespace { const LogComponent componentB = LogComponent::kAccessControl; const LogComponent componentC = LogComponent::kNetwork; const LogComponent componentD = LogComponent::kStorage; - const LogComponent componentE = LogComponent::kJournaling; + const LogComponent componentE = LogComponent::kJournal; // No log component declared at file scope. // Component severity configuration: diff --git a/src/mongo/logger/parse_log_component_settings_test.cpp b/src/mongo/logger/parse_log_component_settings_test.cpp index 7d712426990..7d28483cfd4 100644 --- a/src/mongo/logger/parse_log_component_settings_test.cpp +++ b/src/mongo/logger/parse_log_component_settings_test.cpp @@ -134,7 +134,7 @@ namespace { ASSERT_EQUALS(result.getValue()[2].level, 3); ASSERT_EQUALS(result.getValue()[2].component, LogComponent::kStorage); ASSERT_EQUALS(result.getValue()[3].level, 5); - ASSERT_EQUALS(result.getValue()[3].component, LogComponent::kJournaling); + ASSERT_EQUALS(result.getValue()[3].component, LogComponent::kJournal); } TEST(Multi, FailBadComponent) { |