From: bert hubert <bert.hubert@netherlabs.nl>
Date: Tue, 20 May 2014 19:17:19 +0000 (+0200)
Subject: remove confusing duplicate option experimental-json-server for pdns_recursor. Right... 
X-Git-Tag: rec-3.6.0-rc1~14
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=30a1aa921522aaf6b40142daebc60f9126174dc7;p=pdns

remove confusing duplicate option experimental-json-server for pdns_recursor. Right now it is the only webserver we have, use experimental-webserver
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index b7e6efe37..b2a6608c1 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -1030,8 +1030,6 @@ void makeTCPServerSockets()
   }
 }
 
-
-
 void makeUDPServerSockets()
 {
   vector<string>locals;
@@ -1971,8 +1969,8 @@ try
 
   t_fdm=getMultiplexer();
   if(!t_id) {
-    if(::arg().mustDo("experimental-json-interface")) {
-      L<<Logger::Warning << "Enabling JSON interface" << endl;
+    if(::arg().mustDo("experimental-webserver")) {
+      L<<Logger::Warning << "Enabling web server" << endl;
       try {
         new RecursorWebServer(t_fdm);
       }
@@ -2100,7 +2098,6 @@ int main(int argc, char **argv)
     ::arg().set("processes", "Launch this number of processes (EXPERIMENTAL, DO NOT CHANGE)")="1";
     ::arg().set("config-name","Name of this virtual configuration - will rename the binary image")="";
     ::arg().set( "experimental-logfile", "Filename of the log file for JSON parser" )= "/var/log/pdns.log"; 
-    ::arg().setSwitch( "experimental-json-interface", "If we should run a JSON webserver") = "no";
     ::arg().setSwitch("experimental-webserver", "Start a webserver for monitoring") = "no";
     ::arg().set("experimental-webserver-address", "IP Address of webserver to listen on") = "127.0.0.1";
     ::arg().set("experimental-webserver-port", "Port of webserver to listen on") = "8082";
diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index a437ed687..48897c12a 100644
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -419,11 +419,6 @@ RecursorWebServer::RecursorWebServer(FDMultiplexer* fdm)
 {
   RecursorControlParser rcp; // inits
 
-  if(!arg().mustDo("experimental-webserver")) {
-    d_ws = NULL;
-    return;
-  }
-
   d_ws = new AsyncWebServer(fdm, arg()["experimental-webserver-address"], arg().asNum("experimental-webserver-port"), arg()["experimental-webserver-password"]);
   d_ws->bind();