diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/mongo/db/initialize_server_global_state.cpp | 1 | ||||
-rw-r--r-- | src/mongo/db/server_options.h | 1 | ||||
-rw-r--r-- | src/mongo/db/server_options_base.idl | 9 | ||||
-rw-r--r-- | src/mongo/db/server_options_helpers.cpp | 22 | ||||
-rw-r--r-- | src/mongo/logv2/attribute_storage.h | 8 | ||||
-rw-r--r-- | src/mongo/logv2/log_domain_global.cpp | 9 | ||||
-rw-r--r-- | src/mongo/logv2/log_format.h | 2 | ||||
-rw-r--r-- | src/mongo/shell/dbshell.cpp | 19 | ||||
-rw-r--r-- | src/mongo/shell/servers.js | 9 | ||||
-rw-r--r-- | src/mongo/shell/shell_options.cpp | 21 | ||||
-rw-r--r-- | src/mongo/shell/shell_options.h | 3 | ||||
-rw-r--r-- | src/mongo/shell/shell_options.idl | 6 | ||||
-rw-r--r-- | src/mongo/shell/utils.js | 1 | ||||
-rw-r--r-- | src/mongo/util/log.cpp | 18 | ||||
-rw-r--r-- | src/mongo/util/log_global_settings.h | 1 |
15 files changed, 12 insertions, 118 deletions
diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp index b7f7a3f854c..22e35f3a753 100644 --- a/src/mongo/db/initialize_server_global_state.cpp +++ b/src/mongo/db/initialize_server_global_state.cpp @@ -374,7 +374,6 @@ MONGO_INITIALIZER_GENERAL(ServerLogRedirection, if (logV2Enabled()) { - lv2Config.format = serverGlobalParams.logFormat; lv2Config.timestampFormat = serverGlobalParams.logTimestampFormat; Status result = lv2Manager.getGlobalDomainInternal().configure(lv2Config); if (result.isOK() && writeServerRestartedAfterLogConfig) diff --git a/src/mongo/db/server_options.h b/src/mongo/db/server_options.h index fd35dec3769..ac1b6e3c1d8 100644 --- a/src/mongo/db/server_options.h +++ b/src/mongo/db/server_options.h @@ -96,7 +96,6 @@ struct ServerGlobalParams { std::string timeZoneInfoPath; // Path to time zone info directory, or empty if none. std::string logpath; // Path to log file, if logging to a file; otherwise, empty. - logv2::LogFormat logFormat = logv2::LogFormat::kDefault; // Log format to output to logv2::LogTimestampFormat logTimestampFormat = logv2::LogTimestampFormat::kISO8601Local; bool logAppend = false; // True if logging to a file in append mode. diff --git a/src/mongo/db/server_options_base.idl b/src/mongo/db/server_options_base.idl index fcf7a88047f..7cfc525dbdd 100644 --- a/src/mongo/db/server_options_base.idl +++ b/src/mongo/db/server_options_base.idl @@ -109,10 +109,6 @@ configs: validator: callback: validateSystemLogDestinationSetting - logv2: - description: "logging gets directed to the logv2 backend" - arg_vartype: Switch - source: [ cli, ini ] syslog: description: "Log to system's syslog facility instead of file or stdout" arg_vartype: Switch @@ -126,11 +122,6 @@ configs: arg_vartype: String condition: preprocessor: '!defined(_WIN32)' - 'systemLog.logFormat': - description: 'Set the log output format (default|text|json)' - short_name: logFormat - arg_vartype: String - default: "default" 'systemLog.logAppend': description: 'Append to logpath instead of over-writing' short_name: logappend diff --git a/src/mongo/db/server_options_helpers.cpp b/src/mongo/db/server_options_helpers.cpp index ba592b4eaa6..163cb6ce737 100644 --- a/src/mongo/db/server_options_helpers.cpp +++ b/src/mongo/db/server_options_helpers.cpp @@ -263,10 +263,6 @@ Status storeBaseOptions(const moe::Environment& params) { return ret; } - if (params.count("logv2")) { - logV2Set(true); - } - if (params.count("systemLog.verbosity")) { int verbosity = params["systemLog.verbosity"].as<int>(); if (verbosity < 0) { @@ -382,24 +378,6 @@ Status storeBaseOptions(const moe::Environment& params) { } #endif // _WIN32 - if (params.count("systemLog.logFormat")) { - std::string formatStr = params["systemLog.logFormat"].as<string>(); - if (!logV2Enabled() && formatStr != "default") - return Status(ErrorCodes::BadValue, - "Can only use systemLog.logFormat if logv2 is enabled."); - if (formatStr == "default") { - serverGlobalParams.logFormat = logv2::LogFormat::kDefault; - } else if (formatStr == "text") { - serverGlobalParams.logFormat = logv2::LogFormat::kText; - } else if (formatStr == "json") { - serverGlobalParams.logFormat = logv2::LogFormat::kJson; - } else { - return Status(ErrorCodes::BadValue, - "Unsupported value for logFormat: " + formatStr + - ". Valid values are: default, text or json"); - } - } - if (params.count("systemLog.logAppend") && params["systemLog.logAppend"].as<bool>() == true) { serverGlobalParams.logAppend = true; } diff --git a/src/mongo/logv2/attribute_storage.h b/src/mongo/logv2/attribute_storage.h index 8dc1228d864..2514c0404a7 100644 --- a/src/mongo/logv2/attribute_storage.h +++ b/src/mongo/logv2/attribute_storage.h @@ -287,8 +287,12 @@ template < CustomAttributeValue mapValue(const T& val) { static_assert(HasToString<T>::value || HasToStringReturnStringData<T>::value || HasStringSerialize<T>::value || HasNonMemberToString<T>::value || - HasNonMemberToStringReturnStringData<T>::value, - "custom type needs toString() or serialize(fmt::memory_buffer&) implementation"); + HasNonMemberToStringReturnStringData<T>::value || + HasBSONBuilderAppend<T>::value || HasBSONSerialize<T>::value || + HasToBSON<T>::value || HasToBSONArray<T>::value || + HasNonMemberToBSON<T>::value, + "custom type needs toBSON(), toBSONArray(), serialize(BSONObjBuilder*), " + "toString() or serialize(fmt::memory_buffer&) implementation"); CustomAttributeValue custom; if constexpr (HasBSONBuilderAppend<T>::value) { diff --git a/src/mongo/logv2/log_domain_global.cpp b/src/mongo/logv2/log_domain_global.cpp index 000ed72ffe3..327c046da42 100644 --- a/src/mongo/logv2/log_domain_global.cpp +++ b/src/mongo/logv2/log_domain_global.cpp @@ -187,19 +187,10 @@ Status LogDomainGlobal::Impl::configure(LogDomainGlobal::ConfigurationOptions co }; switch (options.format) { -#if defined(MONGO_CONFIG_TEXT_LOG_DEFAULT) - case LogFormat::kDefault: -#endif - case LogFormat::kText: - setFormatters( - [&] { return TextFormatter(options.maxAttributeSizeKB, options.timestampFormat); }); - break; case LogFormat::kPlain: setFormatters([&] { return PlainFormatter(options.maxAttributeSizeKB); }); break; -#if !defined(MONGO_CONFIG_TEXT_LOG_DEFAULT) case LogFormat::kDefault: -#endif case LogFormat::kJson: setFormatters( [&] { return JSONFormatter(options.maxAttributeSizeKB, options.timestampFormat); }); diff --git a/src/mongo/logv2/log_format.h b/src/mongo/logv2/log_format.h index b1a57287d96..b95a5c297b2 100644 --- a/src/mongo/logv2/log_format.h +++ b/src/mongo/logv2/log_format.h @@ -31,7 +31,7 @@ namespace mongo { namespace logv2 { -enum class LogFormat { kDefault, kText, kJson, kPlain }; +enum class LogFormat { kDefault, kJson, kPlain }; enum class LogTimestampFormat { kISO8601UTC, kISO8601Local }; } // namespace logv2 } // namespace mongo diff --git a/src/mongo/shell/dbshell.cpp b/src/mongo/shell/dbshell.cpp index 89616e477f5..946e1e10782 100644 --- a/src/mongo/shell/dbshell.cpp +++ b/src/mongo/shell/dbshell.cpp @@ -195,9 +195,8 @@ public: /** * Formatter to provide specialized formatting for logs from javascript engine */ -class ShellFormatter final : private logv2::TextFormatter, private logv2::JSONFormatter { +class ShellFormatter final : private logv2::PlainFormatter, private logv2::JSONFormatter { public: - ShellFormatter(bool isJson) : _isJson(isJson) {} void operator()(boost::log::record_view const& rec, boost::log::formatting_ostream& strm) { using namespace logv2; using boost::log::extract; @@ -205,16 +204,9 @@ public: if (extract<LogTag>(attributes::tags(), rec).get().has(LogTag::kPlainShell)) { PlainFormatter::operator()(rec, strm); } else { - if (_isJson) { - JSONFormatter::operator()(rec, strm); - } else { - TextFormatter::operator()(rec, strm); - } + JSONFormatter::operator()(rec, strm); } } - -private: - bool _isJson; }; } // namespace @@ -792,12 +784,7 @@ int _main(int argc, char* argv[], char** envp) { auto consoleSink = boost::make_shared<boost::log::sinks::synchronous_sink<ShellBackend>>(); consoleSink->set_filter(logv2::ComponentSettingsFilter(lv2Manager.getGlobalDomain(), lv2Manager.getGlobalSettings())); -#if defined(MONGO_CONFIG_TEXT_LOG_DEFAULT) - bool isJson = shellGlobalParams.logFormat == logv2::LogFormat::kJson; -#else - bool isJson = shellGlobalParams.logFormat != logv2::LogFormat::kText; -#endif - consoleSink->set_formatter(ShellFormatter(isJson)); + consoleSink->set_formatter(ShellFormatter()); consoleSink->locked_backend()->add_stream( boost::shared_ptr<std::ostream>(&logv2::Console::out(), boost::null_deleter())); diff --git a/src/mongo/shell/servers.js b/src/mongo/shell/servers.js index ce54eb458ce..22ca5e87df3 100644 --- a/src/mongo/shell/servers.js +++ b/src/mongo/shell/servers.js @@ -1129,15 +1129,6 @@ function appendSetParameterArgs(argArray) { argArray.push(...['--setParameter', "disableLogicalSessionCacheRefresh=true"]); } - // New options in 4.3.x - if (!programMajorMinorVersion || programMajorMinorVersion >= 403) { - if (jsTest.options().logFormat) { - if (!argArrayContains("--logFormat")) { - argArray.push(...["--logFormat", jsTest.options().logFormat]); - } - } - } - // Since options may not be backward compatible, mongos options are not // set on older versions, e.g., mongos-3.0. if (programName.endsWith('mongos')) { diff --git a/src/mongo/shell/shell_options.cpp b/src/mongo/shell/shell_options.cpp index eda52f5a155..8ce8dc6e2ad 100644 --- a/src/mongo/shell/shell_options.cpp +++ b/src/mongo/shell/shell_options.cpp @@ -341,27 +341,6 @@ Status storeMongoShellOptions(const moe::Environment& params, } } - if (params.count("logv2")) { - logV2Set(true); - } - - if (params.count("logFormat")) { - std::string formatStr = params["logFormat"].as<string>(); - if (!logV2Enabled() && formatStr != "default") - return Status(ErrorCodes::BadValue, "Can only use logFormat if logv2 is enabled."); - if (formatStr == "default") { - shellGlobalParams.logFormat = logv2::LogFormat::kDefault; - } else if (formatStr == "text") { - shellGlobalParams.logFormat = logv2::LogFormat::kText; - } else if (formatStr == "json") { - shellGlobalParams.logFormat = logv2::LogFormat::kJson; - } else { - return Status(ErrorCodes::BadValue, - "Unsupported value for logFormat: " + formatStr + - ". Valid values are: default, text or json"); - } - } - return Status::OK(); } diff --git a/src/mongo/shell/shell_options.h b/src/mongo/shell/shell_options.h index 9f70f57143f..45ac4e55455 100644 --- a/src/mongo/shell/shell_options.h +++ b/src/mongo/shell/shell_options.h @@ -34,7 +34,6 @@ #include <vector> #include "mongo/base/status.h" -#include "mongo/logv2/log_format.h" #include "mongo/rpc/protocol.h" namespace mongo { @@ -82,8 +81,6 @@ struct ShellGlobalParams { int jsHeapLimitMB = 0; bool nokillop = false; Seconds idleSessionTimeout = Seconds{0}; - - logv2::LogFormat logFormat = logv2::LogFormat::kDefault; // Log format to output to }; extern ShellGlobalParams shellGlobalParams; diff --git a/src/mongo/shell/shell_options.idl b/src/mongo/shell/shell_options.idl index 218a966b833..c56a951b2ee 100644 --- a/src/mongo/shell/shell_options.idl +++ b/src/mongo/shell/shell_options.idl @@ -213,9 +213,3 @@ configs: description: "logging gets directed to the logv2 backend" arg_vartype: Switch source: [ cli, ini ] - - "logFormat": - description: 'Set the log output format (default|text|json)' - short_name: logFormat - arg_vartype: String - default: "default" diff --git a/src/mongo/shell/utils.js b/src/mongo/shell/utils.js index f1472995fc0..dcfface166e 100644 --- a/src/mongo/shell/utils.js +++ b/src/mongo/shell/utils.js @@ -279,7 +279,6 @@ jsTestOptions = function() { wiredTigerIndexConfigString: TestData.wiredTigerIndexConfigString, noJournal: TestData.noJournal, auth: TestData.auth, - logFormat: TestData.logFormat, // Note: keyFile is also used as a flag to indicate cluster auth is turned on, set it // to a truthy value if you'd like to do cluster auth, even if it's not keyFile auth. // Use clusterAuthMode to specify the actual auth mode you want to use. diff --git a/src/mongo/util/log.cpp b/src/mongo/util/log.cpp index ee72ac577a7..fdf9bd251ee 100644 --- a/src/mongo/util/log.cpp +++ b/src/mongo/util/log.cpp @@ -56,26 +56,12 @@ namespace mongo { -#if defined(MONGO_CONFIG_LOGV1_DEFAULT) -static bool _logV2Enabled = false; -#else -static bool _logV2Enabled = true; -#endif - bool logV2Enabled() { - return _logV2Enabled; + return true; } bool logV2IsJson(logv2::LogFormat format) { - return format == logv2::LogFormat::kJson -#if !defined(MONGO_CONFIG_TEXT_LOG_DEFAULT) - || format == logv2::LogFormat::kDefault -#endif - ; -} - -void logV2Set(bool setting) { - _logV2Enabled = setting; + return format == logv2::LogFormat::kJson || format == logv2::LogFormat::kDefault; } static logger::ExtraLogContextFn _appendExtraLogContext; diff --git a/src/mongo/util/log_global_settings.h b/src/mongo/util/log_global_settings.h index 3cf991a8882..9c8d149f7d7 100644 --- a/src/mongo/util/log_global_settings.h +++ b/src/mongo/util/log_global_settings.h @@ -43,7 +43,6 @@ namespace mongo { bool logV2Enabled(); bool logV2IsJson(logv2::LogFormat format); -void logV2Set(bool setting); /** * Runs the same logic as log()/warning()/error(), without actually outputting a stream. |