diff options
author | Henrik Edin <henrik.edin@mongodb.com> | 2020-03-23 10:04:42 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-03-24 20:22:44 +0000 |
commit | edb8778350326d2b33f056b1b5f0b25a4b5b444a (patch) | |
tree | 15afcaa7a707be0872b764cd054aee55d855ba92 /src/mongo/s/server.cpp | |
parent | 51b338ad41653a8188adcc67b682ea12bbe63b4d (diff) | |
download | mongo-edb8778350326d2b33f056b1b5f0b25a4b5b444a.tar.gz |
SERVER-47040 LOGV2_FATAL also fasserts
Added LOGV2_FATAL_NOTRACE and LOGV2_CONTINUE to have different behavior.
Diffstat (limited to 'src/mongo/s/server.cpp')
-rw-r--r-- | src/mongo/s/server.cpp | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp index 04600263475..281d7eecccf 100644 --- a/src/mongo/s/server.cpp +++ b/src/mongo/s/server.cpp @@ -818,11 +818,12 @@ ExitCode mongoSMain(int argc, char* argv[], char** envp) { Status status = runGlobalInitializers(argc, argv, envp); if (!status.isOK()) { - LOGV2_FATAL_OPTIONS(22865, - {logComponentV1toV2(LogComponent::kDefault)}, - "Error during global initialization: {error}", - "Error during global initialization", - "error"_attr = status); + LOGV2_FATAL_OPTIONS( + 22865, + logv2::LogOptions(logv2::LogComponent::kDefault, logv2::FatalMode::kContinue), + "Error during global initialization: {error}", + "Error during global initialization", + "error"_attr = status); return EXIT_ABRUPT; } @@ -830,11 +831,12 @@ ExitCode mongoSMain(int argc, char* argv[], char** envp) { setGlobalServiceContext(ServiceContext::make()); } catch (...) { auto cause = exceptionToStatus(); - LOGV2_FATAL_OPTIONS(22866, - {logComponentV1toV2(LogComponent::kDefault)}, - "Error creating service context: {error}", - "Error creating service context", - "error"_attr = redact(cause)); + LOGV2_FATAL_OPTIONS( + 22866, + logv2::LogOptions(logv2::LogComponent::kDefault, logv2::FatalMode::kContinue), + "Error creating service context: {error}", + "Error creating service context", + "error"_attr = redact(cause)); return EXIT_ABRUPT; } |