Permalink
Browse files

Ignore --fork and --logpath when using --shutdown SERVER-5186 SERVER-…

…5187
  • Loading branch information...
1 parent df84cb3 commit d99695ccc20af5a56bd624bf6a3aa66c7493d592 @RedBeard0531 RedBeard0531 committed with andy10gen Mar 5, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 db/cmdline.cpp
View
@@ -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() );

0 comments on commit d99695c

Please sign in to comment.