diff options
| author | Matt Kangas <matt.kangas@mongodb.com> | 2014-10-07 16:31:25 -0400 |
|---|---|---|
| committer | Matt Kangas <matt.kangas@mongodb.com> | 2014-10-07 21:47:01 -0400 |
| commit | 5e46ce21ff9f5b8034f6f7828c2b817cdaee9bad (patch) | |
| tree | 4c898fb571d90a8c7043f8510536a256796d1487 /src | |
| parent | 01b08ba307425fa3a02d029439a0599e1ecd4a70 (diff) | |
| download | mongo-5e46ce21ff9f5b8034f6f7828c2b817cdaee9bad.tar.gz | |
SERVER-15550 rename LogComponent::kS2 to LogComponent::kGeo
Diffstat (limited to 'src')
| -rw-r--r-- | src/mongo/logger/log_component.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/logger/log_component.h | 2 | ||||
| -rwxr-xr-x | src/third_party/s2/base/logging.h | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/mongo/logger/log_component.cpp b/src/mongo/logger/log_component.cpp index 592bcf31c82..594d07905a6 100644 --- a/src/mongo/logger/log_component.cpp +++ b/src/mongo/logger/log_component.cpp @@ -101,7 +101,7 @@ std::string _dottedNames[LogComponent::kNumLogComponents+1]; case kStorage: return createStringData("storage"); case kJournaling: return createStringData("journaling"); case kWrites: return createStringData("writes"); - case kS2: return createStringData("S2"); + case kGeo: return createStringData("geo"); case kNumLogComponents: return createStringData("total"); // No default. Compiler should complain if there's a log component that's not handled. } @@ -145,7 +145,7 @@ std::string _dottedNames[LogComponent::kNumLogComponents+1]; case kStorage: return createStringData("STORAGE "); case kJournaling: return createStringData("JOURNAL "); case kWrites: return createStringData("WRITES "); - case kS2: return createStringData("S2 "); + case kGeo: return createStringData("GEO "); 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 e104d369430..54b83bcb4a3 100644 --- a/src/mongo/logger/log_component.h +++ b/src/mongo/logger/log_component.h @@ -54,7 +54,7 @@ namespace logger { kStorage, kJournaling, kWrites, - kS2, + kGeo, kNumLogComponents }; diff --git a/src/third_party/s2/base/logging.h b/src/third_party/s2/base/logging.h index 19b4913855b..a466bde8cb1 100755 --- a/src/third_party/s2/base/logging.h +++ b/src/third_party/s2/base/logging.h @@ -61,8 +61,8 @@ #define S2LOG(x) x // Expansion of MONGO_LOG_COMPONENT defined in mongo/util/log.h #define VLOG(x) \ - if (!(::mongo::logger::globalLogDomain())->shouldLog(::mongo::logger::LogComponent::kS2, ::mongo::logger::LogSeverity::Debug(5))) {} \ - else ::mongo::logger::LogstreamBuilder(::mongo::logger::globalLogDomain(), ::mongo::getThreadName(), ::mongo::logger::LogSeverity::Debug(5), ::mongo::logger::LogComponent::kS2) + if (!(::mongo::logger::globalLogDomain())->shouldLog(::mongo::logger::LogComponent::kGeo, ::mongo::logger::LogSeverity::Debug(5))) {} \ + else ::mongo::logger::LogstreamBuilder(::mongo::logger::globalLogDomain(), ::mongo::getThreadName(), ::mongo::logger::LogSeverity::Debug(5), ::mongo::logger::LogComponent::kGeo) class LogMessageInfo { public: |