diff options
author | Mathias Stearn <mathias@10gen.com> | 2012-03-05 14:27:50 -0500 |
---|---|---|
committer | Andy Schwerin <schwerin@10gen.com> | 2012-04-19 15:37:30 -0400 |
commit | d99695ccc20af5a56bd624bf6a3aa66c7493d592 (patch) | |
tree | c73982fbbf008764ceda5c6282cf33b7a8a9aba6 /db | |
parent | df84cb315987723fc3faff5cdd17dc46a6ca778a (diff) | |
download | mongo-d99695ccc20af5a56bd624bf6a3aa66c7493d592.tar.gz |
Ignore --fork and --logpath when using --shutdown SERVER-5186 SERVER-5187
Diffstat (limited to 'db')
-rw-r--r-- | db/cmdline.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/db/cmdline.cpp b/db/cmdline.cpp index fd759a7fc46..346a9aeae01 100644 --- a/db/cmdline.cpp +++ b/db/cmdline.cpp @@ -239,7 +239,7 @@ namespace mongo { cmdLine.noUnixSocket = true; } - if (params.count("fork")) { + if (params.count("fork") && !params.count("shutdown")) { if ( ! params.count( "logpath" ) ) { cout << "--fork has to be used with --logpath" << endl; ::exit(-1); @@ -304,7 +304,7 @@ namespace mongo { } #endif - if (params.count("logpath")) { + if (params.count("logpath") && !params.count("shutdown")) { if ( logpath.size() == 0 ) logpath = params["logpath"].as<string>(); uassert( 10033 , "logpath has to be non-zero" , logpath.size() ); |