summaryrefslogtreecommitdiff
path: root/src/mongo/db/mongod_options.cpp
diff options
context:
space:
mode:
authorHenrik Edin <henrik.edin@mongodb.com>2020-02-20 16:54:57 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-02-23 18:43:31 +0000
commite8f1d29de757d41f7d082d5ca1e667d1b8938741 (patch)
tree40a89fd7ef888cca91c413f4b5ecf981afcbdd99 /src/mongo/db/mongod_options.cpp
parent68dfffe822f1888f221b265dc7974e9f98ea383c (diff)
downloadmongo-e8f1d29de757d41f7d082d5ca1e667d1b8938741.tar.gz
SERVER-46156 Deprecate LogstreamBuilder and more manual log conversions
* Remove setPlainConsoleLogger() * Update errorcodes linter to work with custom user defined log macros rename src/mongo/embedded/{embedded_log_appender.h => embedded_log_backend.h} (61%)
Diffstat (limited to 'src/mongo/db/mongod_options.cpp')
-rw-r--r--src/mongo/db/mongod_options.cpp14
1 files changed, 12 insertions, 2 deletions
diff --git a/src/mongo/db/mongod_options.cpp b/src/mongo/db/mongod_options.cpp
index 9d0030df49e..11c769ca95c 100644
--- a/src/mongo/db/mongod_options.cpp
+++ b/src/mongo/db/mongod_options.cpp
@@ -54,6 +54,8 @@
#include "mongo/db/server_options_nongeneral_gen.h"
#include "mongo/db/server_options_server_helpers.h"
#include "mongo/logv2/log.h"
+#include "mongo/logv2/log_domain_global.h"
+#include "mongo/logv2/log_manager.h"
#include "mongo/util/log.h"
#include "mongo/util/net/ssl_options.h"
#include "mongo/util/options_parser/startup_options.h"
@@ -125,15 +127,23 @@ bool handlePreValidationMongodOptions(const moe::Environment& params,
printMongodHelp(moe::startupOptions);
return false;
}
+
+ auto setPlainLogFormat = []() {
+ auto& globalDomain = logv2::LogManager::global().getGlobalDomainInternal();
+ logv2::LogDomainGlobal::ConfigurationOptions config = globalDomain.config();
+ config.format = logv2::LogFormat::kPlain;
+ invariant(globalDomain.configure(config).isOK());
+ };
+
if (params.count("version") && params["version"].as<bool>() == true) {
- setPlainConsoleLogger();
+ setPlainLogFormat();
auto&& vii = VersionInfoInterface::instance();
LOGV2(20876, "{mongodVersion_vii}", "mongodVersion_vii"_attr = mongodVersion(vii));
vii.logBuildInfo();
return false;
}
if (params.count("sysinfo") && params["sysinfo"].as<bool>() == true) {
- setPlainConsoleLogger();
+ setPlainLogFormat();
sysRuntimeInfo();
return false;
}