SERVER-16209 LogComponent::kJournaling -> kJournal

4 files changed, 6 insertions, 6 deletions

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) {