diff options
| -rw-r--r-- | src/mongo/db/initialize_server_global_state.cpp | 4 | ||||
| -rw-r--r-- | src/mongo/db/initialize_server_global_state.h | 7 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/mongo/db/initialize_server_global_state.cpp b/src/mongo/db/initialize_server_global_state.cpp index 99a5242287c..575cb7e2b67 100644 --- a/src/mongo/db/initialize_server_global_state.cpp +++ b/src/mongo/db/initialize_server_global_state.cpp @@ -62,7 +62,7 @@ namespace mongo { } #endif - bool initializeServerGlobalState(bool isMongodShutdownSpecialCase) { + bool initializeServerGlobalState() { Listener::globalTicketHolder.resize( cmdLine.maxConns ); @@ -165,7 +165,7 @@ namespace mongo { Logstream::useSyslog( sb.str().c_str() ); } #endif - if (!cmdLine.logpath.empty() && !isMongodShutdownSpecialCase) { + if (!cmdLine.logpath.empty()) { fassert(16448, !cmdLine.logWithSyslog); string absoluteLogpath = boost::filesystem::absolute( cmdLine.logpath, cmdLine.cwd).string(); diff --git a/src/mongo/db/initialize_server_global_state.h b/src/mongo/db/initialize_server_global_state.h index 4ef164ba99b..80addd92d04 100644 --- a/src/mongo/db/initialize_server_global_state.h +++ b/src/mongo/db/initialize_server_global_state.h @@ -22,13 +22,8 @@ namespace mongo { * Perform initialization activity common across all mongo server types. * * Set up logging, daemonize the process, configure SSL, etc. - * - * If isMongodShutdownSpecialCase, perform this processing knowing that - * we're only bringing this process up to kill another mongod. - * - * TODO: Untie the knot that requires the isMongodShutdownSpecialCase parameter. */ - bool initializeServerGlobalState(bool isMongodShutdownSpecialCase = false); + bool initializeServerGlobalState(); void setupCoreSignals(); |