diff options
author | Billy Donahue <billy.donahue@mongodb.com> | 2020-04-26 07:05:39 -0400 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-12-08 22:45:08 +0000 |
commit | 7c51aca7fd085ead0ae3e19d967ff1abf111d13a (patch) | |
tree | becfe057d3dbbb88b02ad628fb1a95a30adf686c /src/mongo/db/mongod_options_init.cpp | |
parent | 987484b4aa34deea1db7d70228989b83448a24e8 (diff) | |
download | mongo-7c51aca7fd085ead0ae3e19d967ff1abf111d13a.tar.gz |
SERVER-40811 make initializers throwy
- Consolidate init-related headers (just init.h and initializer.h)
- Factor out a separate DependencyGraph component
- Remove MONGO_DEFAULT_PREREQUISITES, MONGO_NO_PREREQUISITES, MONGO_NO_DEPENDENTS.
- Document the role of the "default" initializer.
Diffstat (limited to 'src/mongo/db/mongod_options_init.cpp')
-rw-r--r-- | src/mongo/db/mongod_options_init.cpp | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/src/mongo/db/mongod_options_init.cpp b/src/mongo/db/mongod_options_init.cpp index 8d9a28d7dfe..34d0ac03e2d 100644 --- a/src/mongo/db/mongod_options_init.cpp +++ b/src/mongo/db/mongod_options_init.cpp @@ -38,7 +38,7 @@ namespace mongo { MONGO_GENERAL_STARTUP_OPTIONS_REGISTER(MongodOptions)(InitializerContext* context) { - return addMongodOptions(&moe::startupOptions); + uassertStatusOK(addMongodOptions(&moe::startupOptions)); } MONGO_INITIALIZER_GENERAL(MongodOptions, @@ -50,23 +50,10 @@ MONGO_INITIALIZER_GENERAL(MongodOptions, } // Run validation, but tell the Environment that we don't want it to be set as "valid", // since we may be making it invalid in the canonicalization process. - Status ret = moe::startupOptionsParsed.validate(false /*setValid*/); - if (!ret.isOK()) { - return ret; - } - ret = validateMongodOptions(moe::startupOptionsParsed); - if (!ret.isOK()) { - return ret; - } - ret = canonicalizeMongodOptions(&moe::startupOptionsParsed); - if (!ret.isOK()) { - return ret; - } - ret = moe::startupOptionsParsed.validate(); - if (!ret.isOK()) { - return ret; - } - return Status::OK(); + uassertStatusOK(moe::startupOptionsParsed.validate(false /*setValid*/)); + uassertStatusOK(validateMongodOptions(moe::startupOptionsParsed)); + uassertStatusOK(canonicalizeMongodOptions(&moe::startupOptionsParsed)); + uassertStatusOK(moe::startupOptionsParsed.validate()); } MONGO_INITIALIZER_GENERAL(CoreOptions_Store, @@ -79,7 +66,6 @@ MONGO_INITIALIZER_GENERAL(CoreOptions_Store, std::cerr << "try '" << context->args()[0] << " --help' for more information" << std::endl; quickExit(EXIT_BADOPTIONS); } - return Status::OK(); } } // namespace mongo |