From: Christian Hofstaedtler <christian@hofstaedtler.name>
Date: Mon, 3 Feb 2014 14:06:43 +0000 (+0100)
Subject: Keep Recursor webserver as experimental
X-Git-Tag: rec-3.6.0-rc1~211^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1249%2Fhead;p=thirdparty%2Fpdns.git

Keep Recursor webserver as experimental
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index f67d31a581..580a17628f 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2034,10 +2034,10 @@ int main(int argc, char **argv)
     ::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("webserver", "Start a webserver for monitoring") = "no";
-    ::arg().set("webserver-address", "IP Address of webserver to listen on") = "127.0.0.1";
-    ::arg().set("webserver-port", "Port of webserver to listen on") = "8082";
-    ::arg().set("webserver-password", "Password required for accessing the webserver") = "";
+    ::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";
+    ::arg().set("experimental-webserver-password", "Password required for accessing the webserver") = "";
     ::arg().set("quiet","Suppress logging of questions and answers")="";
     ::arg().set("logging-facility","Facility to log messages as. 0 corresponds to local0")="";
     ::arg().set("config-dir","Location of configuration directory (recursor.conf)")=SYSCONFDIR;
diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index 53b4f10089..85fcb49ddb 100644
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -48,10 +48,10 @@ RecursorWebServer::RecursorWebServer(FDMultiplexer* fdm)
 {
   RecursorControlParser rcp; // inits
 
-  if(!arg().mustDo("webserver"))
+  if(!arg().mustDo("experimental-webserver"))
     return;
 
-  d_ws = new AsyncWebServer(fdm, arg()["webserver-address"], arg().asNum("webserver-port"), arg()["webserver-password"]);
+  d_ws = new AsyncWebServer(fdm, arg()["experimental-webserver-address"], arg().asNum("experimental-webserver-port"), arg()["experimental-webserver-password"]);
 
   // legacy dispatch
   d_ws->registerApiHandler("/jsonstat", boost::bind(&RecursorWebServer::jsonstat, this, _1, _2));
diff --git a/regression-tests.api/runtests.py b/regression-tests.api/runtests.py
index bfd8fd442b..c6caeff6e3 100755
--- a/regression-tests.api/runtests.py
+++ b/regression-tests.api/runtests.py
@@ -50,7 +50,7 @@ if daemon == 'authoritative':
 else:
 
     # No preparations for recursor
-    pdnscmd = ("../pdns/pdns_recursor --daemon=no --socket-dir=. --local-port=5555 --experimental-json-interface=yes --webserver=yes --webserver-port="+WEBPORT+" --webserver-address=127.0.0.1 --webserver-password="+WEBPASSWORD).split()
+    pdnscmd = ("../pdns/pdns_recursor --daemon=no --socket-dir=. --local-port=5555 --experimental-json-interface=yes --experimental-webserver=yes --experimental-webserver-port="+WEBPORT+" --experimental-webserver-address=127.0.0.1 --experimental-webserver-password="+WEBPASSWORD).split()
 
 
 # Now run pdns and the tests.