summaryrefslogtreecommitdiff
path: root/src/mongo/util/assert_util.cpp
diff options
context:
space:
mode:
authorMathias Stearn <mathias@10gen.com>2017-08-16 17:10:45 -0400
committerMathias Stearn <mathias@10gen.com>2017-08-17 22:13:09 -0400
commit5aa60782cebed045a316b5cd6706be726178ce09 (patch)
tree4f607cde04717bcaac905bcbc7bef5e9a1180426 /src/mongo/util/assert_util.cpp
parent9297a658e1c061b8ee9d96d15b77972c648a866e (diff)
downloadmongo-5aa60782cebed045a316b5cd6706be726178ce09.tar.gz
SERVER-30702 Stop printing stack traces on massert failures
The NoTrace variants were removed as they are now redundant.
Diffstat (limited to 'src/mongo/util/assert_util.cpp')
-rw-r--r--src/mongo/util/assert_util.cpp20
1 files changed, 1 insertions, 19 deletions
diff --git a/src/mongo/util/assert_util.cpp b/src/mongo/util/assert_util.cpp
index 34f8a379751..b1433b0e3b4 100644
--- a/src/mongo/util/assert_util.cpp
+++ b/src/mongo/util/assert_util.cpp
@@ -193,30 +193,12 @@ NOINLINE_DECL void msgassertedWithLocation(int msgid,
StringData msg,
const char* file,
unsigned line) {
- assertionCount.condrollover(++assertionCount.warning);
- error() << "Assertion: " << msgid << ":" << redact(msg) << ' ' << file << ' ' << dec << line
- << endl;
- logContext();
- throw AssertionException(msgid, msg);
-}
-
-NOINLINE_DECL void msgassertedNoTraceWithLocation(int msgid,
- StringData msg,
- const char* file,
- unsigned line) {
- assertionCount.condrollover(++assertionCount.warning);
+ assertionCount.condrollover(++assertionCount.msg);
error() << "Assertion: " << msgid << ":" << redact(msg) << ' ' << file << ' ' << dec << line
<< endl;
throw AssertionException(msgid, msg);
}
-void msgassertedNoTraceWithStatusWithLocation(int msgid,
- const Status& status,
- const char* file,
- unsigned line) {
- msgassertedNoTraceWithLocation(msgid, status.toString(), file, line);
-}
-
std::string causedBy(StringData e) {
constexpr auto prefix = " :: caused by :: "_sd;
std::string out;