mirrors/mongodb
mirrors/mongodb
0
0
Fork 0
mirror of https://github.com/mongodb/mongo.git synced 2024-12-01 09:32:32 +01:00
Code Issues Releases Activity

SERVER-45609 Allow early logging to stdout in shell when using logv2

Browse Source
This commit is contained in:
Henrik Edin 2020-01-16 22:10:57 +00:00 committed by evergreen
parent e34948fe7a
commit afca00af8b
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/mongo/shell/dbshell.cpp
View File

@ -728,14 +728,22 @@ int _main(int argc, char* argv[], char** envp) {
setupSignalHandlers();
setupSignals();
logger::globalLogManager()->getGlobalDomain()->clearAppenders();
logger::globalLogManager()->getGlobalDomain()->attachAppender(
std::make_unique<ShellConsoleAppender>(
std::make_unique<logger::MessageEventDetailsEncoder>()));
// Log to stdout for any early logging before we re-configure the logger
auto& lv2Manager = logv2::LogManager::global();
logv2::LogDomainGlobal::ConfigurationOptions lv2Config;
lv2Config.makeDisabled();
if (logV2Enabled()) {
logger::globalLogManager()->getGlobalDomain()->clearAppenders();
logger::globalLogManager()->getGlobalDomain()->attachAppender(
std::make_unique<logger::LogV2Appender<logger::MessageEventEphemeral>>(
&lv2Manager.getGlobalDomain()));
} else {
logger::globalLogManager()->getGlobalDomain()->clearAppenders();
logger::globalLogManager()->getGlobalDomain()->attachAppender(
std::make_unique<ShellConsoleAppender>(
std::make_unique<logger::MessageEventDetailsEncoder>()));
lv2Config.makeDisabled();
}
uassertStatusOK(lv2Manager.getGlobalDomainInternal().configure(lv2Config));
mongo::shell_utils::RecordMyLocation(argv[0]);
@ -788,6 +796,11 @@ int _main(int argc, char* argv[], char** envp) {
consoleSink->locked_backend()->auto_flush();
// Remove the initial config from above when setting this sink, otherwise we log everything
// twice.
lv2Config.makeDisabled();
uassertStatusOK(lv2Manager.getGlobalDomainInternal().configure(lv2Config));
boost::log::core::get()->add_sink(std::move(consoleSink));
}