From 2fac57f28272d900e7926bed481e42b01cc45d00 Mon Sep 17 00:00:00 2001
From: Andrew Morrow <acm@mongodb.com>
Date: Thu, 27 Apr 2017 14:26:11 -0400
Subject: SERVER-29000 Remove the miniwebserver and derivatives

---
 src/mongo/db/server_options_helpers.cpp | 55 ---------------------------------
 1 file changed, 55 deletions(-)

(limited to 'src/mongo/db/server_options_helpers.cpp')

diff --git a/src/mongo/db/server_options_helpers.cpp b/src/mongo/db/server_options_helpers.cpp
index 37412636992..cd08324cfa2 100644
--- a/src/mongo/db/server_options_helpers.cpp
+++ b/src/mongo/db/server_options_helpers.cpp
@@ -283,19 +283,6 @@ Status addGeneralServerOptions(moe::OptionSection* options) {
             "setParameter", "setParameter", moe::StringMap, "Set a configurable parameter")
         .composing();
 
-    options
-        ->addOptionChaining("httpinterface", "httpinterface", moe::Switch, "enable http interface")
-        .setSources(moe::SourceAllLegacy)
-        .incompatibleWith("nohttpinterface");
-
-    options->addOptionChaining("net.http.enabled", "", moe::Bool, "enable http interface")
-        .setSources(moe::SourceYAMLConfig);
-
-    options
-        ->addOptionChaining(
-            "net.http.port", "", moe::Switch, "port to listen on for http interface")
-        .setSources(moe::SourceYAMLConfig);
-
     options
         ->addOptionChaining(
             "security.transitionToAuth",
@@ -348,14 +335,6 @@ Status addGeneralServerOptions(moe::OptionSection* options) {
             .setSources(moe::SourceAllLegacy);
     }
 
-    // Extra hidden options
-    options
-        ->addOptionChaining(
-            "nohttpinterface", "nohttpinterface", moe::Switch, "disable http interface")
-        .hidden()
-        .setSources(moe::SourceAllLegacy)
-        .incompatibleWith("httpinterface");
-
     options
         ->addOptionChaining("objcheck",
                             "objcheck",
@@ -631,31 +610,6 @@ Status canonicalizeServerOptions(moe::Environment* params) {
         }
     }
 
-    // "net.http.enabled" comes from the config file, so override it if "nohttpinterface" or
-    // "httpinterface" are set since those come from the command line.
-    if (params->count("nohttpinterface")) {
-        Status ret =
-            params->set("net.http.enabled", moe::Value(!(*params)["nohttpinterface"].as<bool>()));
-        if (!ret.isOK()) {
-            return ret;
-        }
-        ret = params->remove("nohttpinterface");
-        if (!ret.isOK()) {
-            return ret;
-        }
-    }
-    if (params->count("httpinterface")) {
-        Status ret =
-            params->set("net.http.enabled", moe::Value((*params)["httpinterface"].as<bool>()));
-        if (!ret.isOK()) {
-            return ret;
-        }
-        ret = params->remove("httpinterface");
-        if (!ret.isOK()) {
-            return ret;
-        }
-    }
-
     // "net.unixDomainSocket.enabled" comes from the config file, so override it if
     // "nounixsocket" is set since that comes from the command line.
     if (params->count("nounixsocket")) {
@@ -783,11 +737,6 @@ Status storeServerOptions(const moe::Environment& params) {
         return ret;
     }
 
-    // Check options that are not yet supported
-    if (params.count("net.http.port")) {
-        return Status(ErrorCodes::BadValue, "The net.http.port option is not currently supported");
-    }
-
     if (params.count("systemLog.verbosity")) {
         int verbosity = params["systemLog.verbosity"].as<int>();
         if (verbosity < 0) {
@@ -834,10 +783,6 @@ Status storeServerOptions(const moe::Environment& params) {
         enableIPv6();
     }
 
-    if (params.count("net.http.enabled")) {
-        serverGlobalParams.isHttpInterfaceEnabled = params["net.http.enabled"].as<bool>();
-    }
-
     if (params.count("security.transitionToAuth")) {
         serverGlobalParams.transitionToAuth = params["security.transitionToAuth"].as<bool>();
     }
-- 
cgit v1.2.1