summaryrefslogtreecommitdiff
path: root/src/mongo/util/log.cpp
diff options
context:
space:
mode:
authorHenrik Edin <henrik.edin@mongodb.com>2020-02-26 09:16:52 -0500
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2020-02-28 15:07:03 +0000
commit9f1853349108cca23a7b012841cfd73b14be9b63 (patch)
tree276de0e20b62973a34b1e712fef7d2b95d17cb57 /src/mongo/util/log.cpp
parent6162bd9a335ebf8c87e1af657439d02d48bbc809 (diff)
downloadmongo-9f1853349108cca23a7b012841cfd73b14be9b63.tar.gz
SERVER-46415 Remove logFormat option and the ability to select the text formatter
Diffstat (limited to 'src/mongo/util/log.cpp')
-rw-r--r--src/mongo/util/log.cpp18
1 files changed, 2 insertions, 16 deletions
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;