diff options
| author | Mathias Stearn <redbeard0531@gmail.com> | 2017-12-18 16:22:33 -0500 |
|---|---|---|
| committer | Mathias Stearn <redbeard0531@gmail.com> | 2017-12-21 13:17:44 -0500 |
| commit | 98471797559d6c907a18d5e4e86a68c459843055 (patch) | |
| tree | 2297af41c3caed2a0fc2ab9664919d63dd65e667 | |
| parent | ec4d0f362962e54465061cbfa2b0ecfabce49ae3 (diff) | |
| download | mongo-98471797559d6c907a18d5e4e86a68c459843055.tar.gz | |
SERVER-30702 Stop printing stack traces on massert failures
Manual backport of 5aa60782cebed045a316b5cd6706be726178ce09 without the
removal of the now-redundant NoTrace variants.
| -rw-r--r-- | src/mongo/util/assert_util.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mongo/util/assert_util.cpp b/src/mongo/util/assert_util.cpp index 9d40b1f5d62..500a8cbb5eb 100644 --- a/src/mongo/util/assert_util.cpp +++ b/src/mongo/util/assert_util.cpp @@ -232,10 +232,9 @@ NOINLINE_DECL void msgassertedWithLocation(int msgid, const char* msg, const char* file, unsigned line) { - assertionCount.condrollover(++assertionCount.warning); + assertionCount.condrollover(++assertionCount.msg); log() << "Assertion: " << msgid << ":" << redact(msg) << ' ' << file << ' ' << dec << line << endl; - logContext(); throw MsgAssertionException(msgid, msg); } @@ -243,7 +242,7 @@ NOINLINE_DECL void msgassertedNoTraceWithLocation(int msgid, const char* msg, const char* file, unsigned line) { - assertionCount.condrollover(++assertionCount.warning); + assertionCount.condrollover(++assertionCount.msg); log() << "Assertion: " << msgid << ":" << redact(msg) << ' ' << file << ' ' << dec << line << endl; throw MsgAssertionException(msgid, msg); |