diff options
| author | Andy Schwerin <schwerin@10gen.com> | 2014-01-10 17:02:59 -0500 |
|---|---|---|
| committer | Andy Schwerin <schwerin@10gen.com> | 2014-01-13 13:37:03 -0500 |
| commit | a21be0c3496c2664aa28412bb5b0d3ad94a14c80 (patch) | |
| tree | c78109cb926d57692ae81555f5cfb0beadcbacb7 /src/mongo/s | |
| parent | ff9150f79740233c21c658cd368a3255bba0d400 (diff) | |
| download | mongo-a21be0c3496c2664aa28412bb5b0d3ad94a14c80.tar.gz | |
SERVER-12202 Use logging system to report failures during runGlobalInitializers in mongod/mongos.
Diffstat (limited to 'src/mongo/s')
| -rw-r--r-- | src/mongo/s/server.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mongo/s/server.cpp b/src/mongo/s/server.cpp index 4820dceba2e..c0b0e06d56b 100644 --- a/src/mongo/s/server.cpp +++ b/src/mongo/s/server.cpp @@ -496,7 +496,12 @@ int mongoSMain(int argc, char* argv[], char** envp) { mongosCommand = argv[0]; - mongo::runGlobalInitializersOrDie(argc, argv, envp); + Status status = mongo::runGlobalInitializers(argc, argv, envp); + if (!status.isOK()) { + severe() << "Failed global initialization: " << status; + ::_exit(EXIT_FAILURE); + } + startupConfigActions(std::vector<std::string>(argv, argv + argc)); cmdline_utils::censorArgvArray(argc, argv); try { |