SERVER-10172 Appenders must be added to global log domain during single threaded operation.

Due to an error during the logging refactoring, the RamLog("global") appender was being attached to the global log domain
during the startup of the web server thread, rather than during mongo-initializer execution.  MongoS and MongoD should both have been susceptible.

Author: Andy Schwerin

src/mongo/db/cmdline.h

@@ -128,6 +128,8 @@ namespace mongo {
         bool logWithSyslog;    // True if logging to syslog; must not be set if logpath is set.
         std::string clusterAuthMode; // Cluster authentication mode
 
+        bool isHttpInterfaceEnabled; // True if the dbwebserver should be enabled.
+
 #ifndef _WIN32
         ProcessId parentProc;      // --fork pid of initial process
         ProcessId leaderProc;      // --fork pid of leader process
@@ -196,7 +198,7 @@ namespace mongo {
         durOptions(0), objcheck(true), oplogSize(0), defaultProfile(0),
         slowMS(100), defaultLocalThresholdMillis(15), pretouch(0), moveParanoia( false ),
         syncdelay(60), noUnixSocket(false), doFork(0), socket("/tmp"), maxConns(DEFAULT_MAX_CONN),
-        logAppend(false), logWithSyslog(false)
+        logAppend(false), logWithSyslog(false), isHttpInterfaceEnabled(false)
     {
         started = time(0);
 

src/mongo/db/db.cpp

@@ -104,7 +104,6 @@ namespace mongo {
 
     CmdLine cmdLine;
     static bool scriptingEnabled = true;
-    static bool httpInterface = false;
     bool shouldRepairDatabases = 0;
     static bool forceRepair = 0;
     Timer startupSrandTimer;
@@ -288,7 +287,7 @@ namespace mongo {
 
         logStartup();
         startReplication();
-        if ( httpInterface )
+        if ( cmdLine.isHttpInterfaceEnabled )
             boost::thread web( boost::bind(&webServerThread, new RestAdminAccess() /* takes ownership */));
 
 #if(TESTEXHAUST)
@@ -997,7 +996,7 @@ static void processCommandLineOptions(const std::vector<std::string>& argv) {
                 log() << "can't have both --httpinterface and --nohttpinterface" << endl;
                 ::_exit( EXIT_BADOPTIONS );
             }
-            httpInterface = true;
+            cmdLine.isHttpInterfaceEnabled = true;
         }
         // SERVER-10019 Enabling rest/jsonp without --httpinterface should break in the future 
         if (params.count("rest")) {
@@ -1009,7 +1008,7 @@ static void processCommandLineOptions(const std::vector<std::string>& argv) {
                 log() << "** WARNING: --rest is specified without --httpinterface," << 
                     startupWarningsLog;
                 log() << "**          enabling http interface" << startupWarningsLog;
-                httpInterface = true;
+                cmdLine.isHttpInterfaceEnabled = true;
             }
             cmdLine.rest = true;
         }
@@ -1022,7 +1021,7 @@ static void processCommandLineOptions(const std::vector<std::string>& argv) {
                 log() << "** WARNING --jsonp is specified without --httpinterface," << 
                     startupWarningsLog;
                 log() << "**         enabling http interface" << startupWarningsLog;
-                httpInterface = true;
+                cmdLine.isHttpInterfaceEnabled = true;
             }
             cmdLine.jsonp = true;
         }

src/mongo/db/dbwebserver.cpp

@@ -329,9 +329,6 @@ namespace mongo {
     class LogPlugin : public WebStatusPlugin {
     public:
         LogPlugin() : WebStatusPlugin( "Log" , 100 ), _log(0) {
-        }
-
-        virtual void init() {
             _log = RamLog::get( "global" );
             if ( ! _log ) {
                 _log = new RamLog("global");
@@ -340,6 +337,9 @@ namespace mongo {
             }
         }
 
+        virtual void init() {
+        }
+
         virtual void run( stringstream& ss ) {
             _log->toHTML( ss );
         }
@@ -349,7 +349,9 @@ namespace mongo {
     MONGO_INITIALIZER_GENERAL(WebStatusLogPlugin, ("ServerLogRedirection"), ("default"))(
             InitializerContext*) {
 
-        new LogPlugin;
+        if (cmdLine.isHttpInterfaceEnabled) {
+            new LogPlugin;
+        }
         return Status::OK();
     }
 

src/mongo/s/server.cpp

@@ -80,7 +80,6 @@ namespace mongo {
     string mongosCommand;
     bool dbexitCalled = false;
     static bool scriptingEnabled = true;
-    static bool httpInterface = false;
     static vector<string> configdbs;
 
     bool inShutdown() {
@@ -335,7 +334,7 @@ static bool runMongosServer( bool doUpgrade ) {
     CmdLine::launchOk();
 #endif
 
-    if ( httpInterface )
+    if ( cmdLine.isHttpInterfaceEnabled )
         boost::thread web( boost::bind(&webServerThread, new NoAdminAccess() /* takes ownership */) );
 
     MessageServer::Options opts;
@@ -463,7 +462,7 @@ static void processCommandLineOptions(const std::vector<std::string>& argv) {
             out() << "can't have both --httpinterface and --nohttpinterface" << endl;
             ::_exit(EXIT_FAILURE);
         }
-        httpInterface = true;
+        cmdLine.isHttpInterfaceEnabled = true;
     }
 
     if (params.count("noAutoSplit")) {