diff options
| author | Henrik Edin <henrik.edin@mongodb.com> | 2020-03-10 15:07:40 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-03-11 21:19:39 +0000 |
| commit | 24c4b716145d290a22286b9861274a704aa8fe0b (patch) | |
| tree | 915c94c0b6d90292969bab63b0ab238fbe1c2900 /src/mongo/logv2 | |
| parent | aeae7b5345b7c75b9e46a17d7eefaff59fb05de1 (diff) | |
| download | mongo-24c4b716145d290a22286b9861274a704aa8fe0b.tar.gz | |
SERVER-46771 Select message string in log when providing both message and format string.
Diffstat (limited to 'src/mongo/logv2')
| -rw-r--r-- | src/mongo/logv2/log_detail.h | 3 | ||||
| -rw-r--r-- | src/mongo/logv2/log_test_v2.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/mongo/logv2/log_detail.h b/src/mongo/logv2/log_detail.h index 90e143d3002..ffa07990ef6 100644 --- a/src/mongo/logv2/log_detail.h +++ b/src/mongo/logv2/log_detail.h @@ -68,8 +68,7 @@ void doLog(int32_t id, S const& fmtmsg, const char (&msg)[N], const fmt::internal::named_arg<Args, char>&... args) { - // TODO: When using JSON formatter, use 'msg' instead of 'fmtmsg' below. - doLog(id, severity, options, fmtmsg, args...); + doLog(id, severity, options, msg, args...); } template <typename S> diff --git a/src/mongo/logv2/log_test_v2.cpp b/src/mongo/logv2/log_test_v2.cpp index 9911ee354c9..b259ad07091 100644 --- a/src/mongo/logv2/log_test_v2.cpp +++ b/src/mongo/logv2/log_test_v2.cpp @@ -244,9 +244,9 @@ TEST_F(LogTestV2, Basic) { t4.serialize(buffer); ASSERT_EQUALS(lines.back(), fmt::to_string(buffer)); - // Text formatter selects format string + // Message string is selected when using API that also take a format string LOGV2(20084, "fmtstr {name}", "msgstr", "name"_attr = 1); - ASSERT_EQUALS(lines.back(), "fmtstr 1"); + ASSERT_EQUALS(lines.back(), "msgstr"); // Test that logging exceptions does not propagate out to user code in release builds if (!kDebugBuild) { |