diff options
| author | Cheahuychou Mao <cheahuychou.mao@mongodb.com> | 2020-03-24 17:39:15 -0400 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-03-27 22:39:04 +0000 |
| commit | 2abab48428af3ba6e1dd9a911f2aa34c77ecb891 (patch) | |
| tree | d3ed14843579a198c8871ce27b6f5e9637c8c271 /src/mongo/util/assert_util.cpp | |
| parent | 86daed7acfc1a2adf97bf7d7b2ae009d7b52df24 (diff) | |
| download | mongo-2abab48428af3ba6e1dd9a911f2aa34c77ecb891.tar.gz | |
SERVER-47076 Clean up log lines in mongo/util
Diffstat (limited to 'src/mongo/util/assert_util.cpp')
| -rw-r--r-- | src/mongo/util/assert_util.cpp | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/src/mongo/util/assert_util.cpp b/src/mongo/util/assert_util.cpp index c9dab10006a..c4d40969d6f 100644 --- a/src/mongo/util/assert_util.cpp +++ b/src/mongo/util/assert_util.cpp @@ -77,7 +77,7 @@ AtomicWord<bool> DBException::traceExceptions(false); void DBException::traceIfNeeded(const DBException& e) { if (traceExceptions.load()) { - LOGV2_WARNING(23075, "DBException thrown{causedBy_e}", "causedBy_e"_attr = causedBy(e)); + LOGV2_WARNING(23075, "DBException thrown {error}", "DBException thrown", "error"_attr = e); printStackTrace(); } } @@ -86,6 +86,7 @@ MONGO_COMPILER_NOINLINE void verifyFailed(const char* expr, const char* file, un assertionCount.condrollover(assertionCount.regular.addAndFetch(1)); LOGV2_ERROR(23076, "Assertion failure {expr} {file} {line}", + "Assertion failure", "expr"_attr = expr, "file"_attr = file, "line"_attr = line); @@ -108,6 +109,7 @@ MONGO_COMPILER_NOINLINE void invariantFailed(const char* expr, unsigned line) noexcept { LOGV2_FATAL_CONTINUE(23079, "Invariant failure {expr} {file} {line}", + "Invariant failure", "expr"_attr = expr, "file"_attr = file, "line"_attr = line); @@ -122,6 +124,7 @@ MONGO_COMPILER_NOINLINE void invariantFailedWithMsg(const char* expr, unsigned line) noexcept { LOGV2_FATAL_CONTINUE(23081, "Invariant failure {expr} {msg} {file} {line}", + "Invariant failure", "expr"_attr = expr, "msg"_attr = msg, "file"_attr = file, @@ -136,9 +139,10 @@ MONGO_COMPILER_NOINLINE void invariantOKFailed(const char* expr, const char* file, unsigned line) noexcept { LOGV2_FATAL_CONTINUE(23083, - "Invariant failure: {expr} resulted in status {status} at {file} {line}", + "Invariant failure {expr} resulted in status {error} at {file} {line}", + "Invariant failure", "expr"_attr = expr, - "status"_attr = redact(status), + "error"_attr = redact(status), "file"_attr = file, "line"_attr = line); breakpoint(); @@ -153,10 +157,11 @@ MONGO_COMPILER_NOINLINE void invariantOKFailedWithMsg(const char* expr, unsigned line) noexcept { LOGV2_FATAL_CONTINUE( 23085, - "Invariant failure: {expr} {msg} resulted in status {status} at {file} {line}", + "Invariant failure {expr} {msg} resulted in status {error} at {file} {line}", + "Invariant failure", "expr"_attr = expr, "msg"_attr = msg, - "status"_attr = redact(status), + "error"_attr = redact(status), "file"_attr = file, "line"_attr = line); breakpoint(); @@ -168,8 +173,9 @@ MONGO_COMPILER_NOINLINE void invariantStatusOKFailed(const Status& status, const char* file, unsigned line) noexcept { LOGV2_FATAL_CONTINUE(23087, - "Invariant failure {status} at {file} {line}", - "status"_attr = redact(status), + "Invariant failure {error} at {file} {line}", + "Invariant failure", + "error"_attr = redact(status), "file"_attr = file, "line"_attr = line); breakpoint(); @@ -181,7 +187,8 @@ MONGO_COMPILER_NOINLINE void fassertFailedWithLocation(int msgid, const char* file, unsigned line) noexcept { LOGV2_FATAL_CONTINUE(23089, - "Fatal Assertion {msgid} at {file} {line}", + "Fatal assertion {msgid} at {file} {line}", + "Fatal assertion", "msgid"_attr = msgid, "file"_attr = file, "line"_attr = line); @@ -194,7 +201,8 @@ MONGO_COMPILER_NOINLINE void fassertFailedNoTraceWithLocation(int msgid, const char* file, unsigned line) noexcept { LOGV2_FATAL_CONTINUE(23091, - "Fatal Assertion {msgid} at {file} {line}", + "Fatal assertion {msgid} at {file} {line}", + "Fatal assertion", "msgid"_attr = msgid, "file"_attr = file, "line"_attr = line); @@ -208,9 +216,10 @@ MONGO_COMPILER_NORETURN void fassertFailedWithStatusWithLocation(int msgid, const char* file, unsigned line) noexcept { LOGV2_FATAL_CONTINUE(23093, - "Fatal assertion {msgid} {status} at {file} {line}", + "Fatal assertion {msgid} {error} at {file} {line}", + "Fatal assertion", "msgid"_attr = msgid, - "status"_attr = redact(status), + "error"_attr = redact(status), "file"_attr = file, "line"_attr = line); breakpoint(); @@ -223,9 +232,10 @@ MONGO_COMPILER_NORETURN void fassertFailedWithStatusNoTraceWithLocation(int msgi const char* file, unsigned line) noexcept { LOGV2_FATAL_CONTINUE(23095, - "Fatal assertion {msgid} {status} at {file} {line}", + "Fatal assertion {msgid} {error} at {file} {line}", + "Fatal assertion", "msgid"_attr = msgid, - "status"_attr = redact(status), + "error"_attr = redact(status), "file"_attr = file, "line"_attr = line); breakpoint(); @@ -239,8 +249,9 @@ MONGO_COMPILER_NOINLINE void uassertedWithLocation(const Status& status, assertionCount.condrollover(assertionCount.user.addAndFetch(1)); LOGV2_DEBUG(23074, 1, - "User Assertion: {status} {file} {line}", - "status"_attr = redact(status), + "User assertion {error} {file} {line}", + "User assertion", + "error"_attr = redact(status), "file"_attr = file, "line"_attr = line); error_details::throwExceptionForStatus(status); @@ -251,8 +262,9 @@ MONGO_COMPILER_NOINLINE void msgassertedWithLocation(const Status& status, unsigned line) { assertionCount.condrollover(assertionCount.msg.addAndFetch(1)); LOGV2_ERROR(23077, - "Assertion: {status} {file} {line}", - "status"_attr = redact(status), + "Assertion {error} {file} {line}", + "Assertion", + "error"_attr = redact(status), "file"_attr = file, "line"_attr = line); error_details::throwExceptionForStatus(status); |