diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2020-03-22 22:32:49 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-03-23 13:31:33 +0000 |
| commit | 2e58eb2e8a79c4fb4d12465616fa89ab498eb05c (patch) | |
| tree | 73bba1b90f30d2446c9c6390f3215de501669318 /src/mongo/s/version_mongos.cpp | |
| parent | 5846d4b66cf0adb154dbe89c696a750bc0a1082c (diff) | |
| download | mongo-2e58eb2e8a79c4fb4d12465616fa89ab498eb05c.tar.gz | |
SERVER-46765 fix '--version' & '--sysinfo', which use kPlain logging
This reverts commit 79a8452b2a813b796059e5eab6c18f685283ce08.
with new spot fix: printCommandLineOpts when sending to log
Diffstat (limited to 'src/mongo/s/version_mongos.cpp')
| -rw-r--r-- | src/mongo/s/version_mongos.cpp | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/src/mongo/s/version_mongos.cpp b/src/mongo/s/version_mongos.cpp index e5c268554d5..ff2cc60946e 100644 --- a/src/mongo/s/version_mongos.cpp +++ b/src/mongo/s/version_mongos.cpp @@ -44,18 +44,15 @@ namespace mongo { -void printShardingVersionInfo(bool isForVersionReportingOnly) { - auto&& vii = VersionInfoInterface::instance(); - - if (isForVersionReportingOnly) { - auto& globalDomain = logv2::LogManager::global().getGlobalDomainInternal(); - logv2::LogDomainGlobal::ConfigurationOptions config = globalDomain.config(); - config.format = logv2::LogFormat::kPlain; - invariant(globalDomain.configure(config).isOK()); - LOGV2(22900, "{mongosVersion_vii}", "mongosVersion_vii"_attr = mongosVersion(vii)); - vii.logBuildInfo(); +void logShardingVersionInfo(std::ostream* os) { + if (os) { + auto&& vii = VersionInfoInterface::instance(); + *os << mongosVersion(vii) << std::endl; + vii.logBuildInfo(os); + *os << std::endl; } else { - logProcessDetails(); + logProcessDetails(nullptr); } } + } // namespace mongo |