From a35306f9a681b64c6abd7f26a8539aa7c631d65f Mon Sep 17 00:00:00 2001
From: Pieter Lexis <pieter.lexis@powerdns.com>
Date: Mon, 21 Jan 2019 17:59:13 +0100
Subject: [PATCH] webserver: rename 'common' to normal wrt loglevels

---
 pdns/common_startup.cc | 2 +-
 pdns/pdns_recursor.cc  | 2 +-
 pdns/webserver.cc      | 2 +-
 pdns/webserver.hh      | 6 +++---
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pdns/common_startup.cc b/pdns/common_startup.cc
index 14376e723c..66453e4d1a 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, common, detailed)")="common";
+  ::arg().set("webserver-log-level","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 1bc77a9572..40bd3703d2 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -4185,7 +4185,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, common, detailed)")="common";
+    ::arg().set("webserver-log-level","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/webserver.cc b/pdns/webserver.cc
index 740922a078..e83666fd4b 100644
--- a/pdns/webserver.cc
+++ b/pdns/webserver.cc
@@ -388,7 +388,7 @@ void WebServer::serveConnection(std::shared_ptr<Socket> client) const {
     g_log<<Logger::Error<<logprefix<<"Unknown exception"<<endl;
   }
 
-  if (d_loglevel >= WebServer::LogLevel::Common) {
+  if (d_loglevel >= WebServer::LogLevel::Normal) {
     g_log<<Logger::Info<<logprefix<<remote<<" \""<<req.method<<" "<<req.url.path<<" HTTP/"<<req.versionStr(req.version)<<"\" "<<resp.status<<" "<<reply.size()<<endl;
   }
 }
diff --git a/pdns/webserver.hh b/pdns/webserver.hh
index 5817d66099..69d157f5bd 100644
--- a/pdns/webserver.hh
+++ b/pdns/webserver.hh
@@ -187,7 +187,7 @@ public:
 
   enum class LogLevel : uint8_t {
     None = 0,                // No logs from requests at all
-    Common = 10,             // A "common log format"-like line e.g. '127.0.0.1 "GET /apache_pb.gif HTTP/1.0" 200 2326'
+    Normal = 10,             // A "common log format"-like line e.g. '127.0.0.1 "GET /apache_pb.gif HTTP/1.0" 200 2326'
     Detailed = 20,           // The full request headers and body, and the full response headers and body
   };
 
@@ -197,8 +197,8 @@ public:
       return;
     }
 
-    if (level == "common") {
-      d_loglevel = LogLevel::Common;
+    if (level == "normal") {
+      d_loglevel = LogLevel::Normal;
       return;
     }
 
-- 
2.47.2