diff options
author | Kevin Pulo <kevin.pulo@mongodb.com> | 2016-08-16 22:08:49 +1000 |
---|---|---|
committer | Kevin Pulo <kevin.pulo@mongodb.com> | 2016-08-16 22:10:46 +1000 |
commit | 512a1d57f6b3560cc3531355676cf06d362c93a1 (patch) | |
tree | 4a4c8585f07e48a6c3c6b009e28d65ea402c9e56 /src/mongo/s | |
parent | 51fe71a4169d8ac01dca915b482c94e228d8a746 (diff) | |
download | mongo-512a1d57f6b3560cc3531355676cf06d362c93a1.tar.gz |
SERVER-24914 SERVER-24915 improve getting cwd at server startup
Diffstat (limited to 'src/mongo/s')
-rw-r--r-- | src/mongo/s/mongos_options.cpp | 4 | ||||
-rw-r--r-- | src/mongo/s/mongos_options.h | 2 | ||||
-rw-r--r-- | src/mongo/s/mongos_options_init.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/s/mongos_options.cpp b/src/mongo/s/mongos_options.cpp index b5115a81cdb..b2bcedb04ca 100644 --- a/src/mongo/s/mongos_options.cpp +++ b/src/mongo/s/mongos_options.cpp @@ -175,8 +175,8 @@ Status canonicalizeMongosOptions(moe::Environment* params) { return Status::OK(); } -Status storeMongosOptions(const moe::Environment& params, const std::vector<std::string>& args) { - Status ret = storeServerOptions(params, args); +Status storeMongosOptions(const moe::Environment& params) { + Status ret = storeServerOptions(params); if (!ret.isOK()) { return ret; } diff --git a/src/mongo/s/mongos_options.h b/src/mongo/s/mongos_options.h index d13c2de9d65..8ac3a1d9321 100644 --- a/src/mongo/s/mongos_options.h +++ b/src/mongo/s/mongos_options.h @@ -77,7 +77,7 @@ Status validateMongosOptions(const moe::Environment& params); */ Status canonicalizeMongosOptions(moe::Environment* params); -Status storeMongosOptions(const moe::Environment& params, const std::vector<std::string>& args); +Status storeMongosOptions(const moe::Environment& params); // This function should eventually go away, but needs to be here now because the sorter and // the version manager must know at runtime which binary it is in. diff --git a/src/mongo/s/mongos_options_init.cpp b/src/mongo/s/mongos_options_init.cpp index 5a091d16c23..8fc33099abd 100644 --- a/src/mongo/s/mongos_options_init.cpp +++ b/src/mongo/s/mongos_options_init.cpp @@ -69,7 +69,7 @@ MONGO_INITIALIZER_GENERAL(MongosOptions_Store, ("BeginStartupOptionStorage"), ("EndStartupOptionStorage")) (InitializerContext* context) { - Status ret = storeMongosOptions(moe::startupOptionsParsed, context->args()); + Status ret = storeMongosOptions(moe::startupOptionsParsed); if (!ret.isOK()) { std::cerr << ret.toString() << std::endl; std::cerr << "try '" << context->args()[0] << " --help' for more information" << std::endl; |