Update webserver-loglevel docs

diff --git a/docs/settings.rst b/docs/settings.rst
index 43b07de246aaf0cb34c160344d8b4f62b86c60d7..a893099041c75af631ba1d1d18d149e35f45a299 100644 (file)
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -1622,30 +1622,30 @@ Webserver/API access is only allowed from these subnets.
 The amount of logging the webserver must do. "none" means no useful webserver information will be logged.
 When set to "normal", the webserver will log a line per request that should be familiar::
 
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e> 127.0.0.1:55376 "GET /api/v1/servers/localhost/bla HTTP/1.1" 404 196
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e 127.0.0.1:55376 "GET /api/v1/servers/localhost/bla HTTP/1.1" 404 196
 
 When set to "detailed", all information about the request and response are logged::
 
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e> Request Details:
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>  Headers:
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   accept-encoding: gzip, deflate
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   accept-language: en-US,en;q=0.5
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   connection: keep-alive
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   dnt: 1
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   host: 127.0.0.1:8081
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   upgrade-insecure-requests: 1
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:64.0) Gecko/20100101 Firefox/64.0
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>  No body
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e> Response details:
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>  Headers:
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   Connection: close
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   Content-Length: 49
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   Content-Type: text/html; charset=utf-8
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   Server: PowerDNS/0.0.15896.0.gaba8bab3ab
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>  Full body: 
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e>   <!html><title>Not Found</title><h1>Not Found</h1>
-  [webserver] <e235780e-a5cf-415e-9326-9d33383e739e> 127.0.0.1:55376 "GET /api/v1/servers/localhost/bla HTTP/1.1" 404 196
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e Request Details:
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e  Headers:
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   accept-encoding: gzip, deflate
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   accept-language: en-US,en;q=0.5
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   connection: keep-alive
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   dnt: 1
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   host: 127.0.0.1:8081
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   upgrade-insecure-requests: 1
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:64.0) Gecko/20100101 Firefox/64.0
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e  No body
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e Response details:
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e  Headers:
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   Connection: close
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   Content-Length: 49
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   Content-Type: text/html; charset=utf-8
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   Server: PowerDNS/0.0.15896.0.gaba8bab3ab
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e  Full body: 
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   <!html><title>Not Found</title><h1>Not Found</h1>
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e 127.0.0.1:55376 "GET /api/v1/servers/localhost/bla HTTP/1.1" 404 196
 
 The value between the hooks is a UUID that is generated for each request. This can be used to find all lines related to a single request.
 

diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst
index 5d44334fdbc4aabcc267eb68570542a470ce9047..2e4503ba973526981dd92aa871132e430b7e6292 100644 (file)
--- a/pdns/recursordist/docs/settings.rst
+++ b/pdns/recursordist/docs/settings.rst
@@ -1512,6 +1512,47 @@ IP address for the webserver to listen on.
 
 These subnets are allowed to access the webserver.
 
+.. _setting-webserver-loglevel:
+
+``webserver-loglevel``
+----------------------
+.. versionadded:: 4.2.0
+
+-  String, one of "none", "normal", "detailed"
+
+The amount of logging the webserver must do. "none" means no useful webserver information will be logged.
+When set to "normal", the webserver will log a line per request that should be familiar::
+
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e 127.0.0.1:55376 "GET /api/v1/servers/localhost/bla HTTP/1.1" 404 196
+
+When set to "detailed", all information about the request and response are logged::
+
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e Request Details:
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e  Headers:
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   accept-encoding: gzip, deflate
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   accept-language: en-US,en;q=0.5
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   connection: keep-alive
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   dnt: 1
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   host: 127.0.0.1:8081
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   upgrade-insecure-requests: 1
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   user-agent: Mozilla/5.0 (X11; Linux x86_64; rv:64.0) Gecko/20100101 Firefox/64.0
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e  No body
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e Response details:
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e  Headers:
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   Connection: close
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   Content-Length: 49
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   Content-Type: text/html; charset=utf-8
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   Server: PowerDNS/0.0.15896.0.gaba8bab3ab
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e  Full body: 
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e   <!html><title>Not Found</title><h1>Not Found</h1>
+  [webserver] e235780e-a5cf-415e-9326-9d33383e739e 127.0.0.1:55376 "GET /api/v1/servers/localhost/bla HTTP/1.1" 404 196
+
+The value between the hooks is a UUID that is generated for each request. This can be used to find all lines related to a single request.
+
+.. note::
+  The webserver logs these line on the NOTICE level. The :ref:`settings-loglevel` seting must be 5 or higher for these lines to end up in the log.
+
 .. _setting-webserver-password:
 
 ``webserver-password``