From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Wed, 6 Mar 2019 09:00:31 +0000 (+0100)
Subject: webserver: rename log-level to loglevel
X-Git-Tag: dnsdist-1.4.0-alpha1~39^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ca656a87c7ca8916d502f428428fc1647937098;p=thirdparty%2Fpdns.git

webserver: rename log-level to loglevel
---

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 7bc6e08f79..30ff5ddf6c 100644
--- a/pdns/common_startup.cc
+++ b/pdns/common_startup.cc
@@ -150,7 +150,7 @@ void declareArguments()
   ::arg().set("webserver-port","Port of webserver/API to listen on")="8081";
   ::arg().set("webserver-password","Password required for accessing the webserver")="";
   ::arg().set("webserver-allow-from","Webserver/API access is only allowed from these subnets")="127.0.0.1,::1";
-  ::arg().set("webserver-log-level", "Amount of logging in the webserver (none, normal, detailed)") = "normal";
+  ::arg().set("webserver-loglevel", "Amount of logging in the webserver (none, normal, detailed)") = "normal";
 
   ::arg().setSwitch("do-ipv6-additional-processing", "Do AAAA additional processing")="yes";
   ::arg().setSwitch("query-logging","Hint backends that queries should be logged")="no";
diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index d76ba373de..90111d8711 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -4196,7 +4196,7 @@ int main(int argc, char **argv)
     ::arg().set("webserver-port", "Port of webserver to listen on") = "8082";
     ::arg().set("webserver-password", "Password required for accessing the webserver") = "";
     ::arg().set("webserver-allow-from","Webserver access is only allowed from these subnets")="127.0.0.1,::1";
-    ::arg().set("webserver-log-level", "Amount of logging in the webserver (none, normal, detailed)") = "normal";
+    ::arg().set("webserver-loglevel", "Amount of logging in the webserver (none, normal, detailed)") = "normal";
     ::arg().set("carbon-ourname", "If set, overrides our reported hostname for carbon stats")="";
     ::arg().set("carbon-server", "If set, send metrics in carbon (graphite) format to this server IP address")="";
     ::arg().set("carbon-interval", "Number of seconds between carbon (graphite) updates")="30";
diff --git a/pdns/ws-auth.cc b/pdns/ws-auth.cc
index 0a1011d061..8db304cfd8 100644
--- a/pdns/ws-auth.cc
+++ b/pdns/ws-auth.cc
@@ -72,7 +72,7 @@ AuthWebServer::AuthWebServer() :
     d_ws = new WebServer(arg()["webserver-address"], arg().asNum("webserver-port"));
     d_ws->setApiKey(arg()["api-key"]);
     d_ws->setPassword(arg()["webserver-password"]);
-    d_ws->setLogLevel(arg()["webserver-log-level"]);
+    d_ws->setLogLevel(arg()["webserver-loglevel"]);
 
     NetmaskGroup acl;
     acl.toMasks(::arg()["webserver-allow-from"]);
diff --git a/pdns/ws-recursor.cc b/pdns/ws-recursor.cc
index af7bf5c791..58fbea82ce 100644
--- a/pdns/ws-recursor.cc
+++ b/pdns/ws-recursor.cc
@@ -453,7 +453,7 @@ RecursorWebServer::RecursorWebServer(FDMultiplexer* fdm)
   d_ws = new AsyncWebServer(fdm, arg()["webserver-address"], arg().asNum("webserver-port"));
   d_ws->setApiKey(arg()["api-key"]);
   d_ws->setPassword(arg()["webserver-password"]);
-  d_ws->setLogLevel(arg()["webserver-log-level"]);
+  d_ws->setLogLevel(arg()["webserver-loglevel"]);
 
   NetmaskGroup acl;
   acl.toMasks(::arg()["webserver-allow-from"]);