rec: Don't always override `loglevel` to 6

diff --git a/docs/markdown/recursor/settings.md b/docs/markdown/recursor/settings.md
index 49bd3bbb80fb63bcac8c8f0ab6f8dbd4fb647427..5c5fdf22243ca82228758505d8fcf543f59caca7 100644 (file)
--- a/docs/markdown/recursor/settings.md
+++ b/docs/markdown/recursor/settings.md
@@ -432,7 +432,7 @@ mask configuration issues and for this reason it is disabled by default.
 
 ## `loglevel`
 * Integer between 0 and 9
-* Default: 4
+* Default: 6
 * Available since: 3.6
 
 Amount of logging. Higher is more, more logging may destroy performance.

diff --git a/docs/markdown/recursor/upgrading.md b/docs/markdown/recursor/upgrading.md
index ac631b6c534ba47f7b25b5b74f3a58a6744deaff..afdc14b09d46fac96a9d238d37d41691df4650b9 100644 (file)
--- a/docs/markdown/recursor/upgrading.md
+++ b/docs/markdown/recursor/upgrading.md
@@ -1,6 +1,12 @@
 Before upgrading, it is advised to read the [changelog](../changelog.md).
 When upgrading several versions, please read **all** notes applying to the upgrade.
 
+# 4.0.x to 4.1.0
+
+[`setting-max-recursion-depth`](settings.md#setting-max-recursion-depth) defaulted to 4 but
+was always overridden to 6 during the startup. The issue has been fixed and the default value
+set to 6 to keep the behavior consistent.
+
 # 4.0.5 to 4.0.6
 
 One default was changed:

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 563272b97f8bd1b211c1845571a56cc5e7a76231..c73dcee0f28ba8c1bb0b3b078b8247eadb3ecffc 100644 (file)
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -2678,7 +2678,6 @@ static void setupDelegationOnly()
 static int serviceMain(int argc, char*argv[])
 {
   L.setName(s_programname);
-  L.setLoglevel((Logger::Urgency)(6)); // info and up
   L.disableSyslog(::arg().mustDo("disable-syslog"));
 
   if(!::arg()["logging-facility"].empty()) {
@@ -3132,7 +3131,7 @@ int main(int argc, char **argv)
     ::arg().set("dnssec-log-bogus", "Log DNSSEC bogus validations")="no";
     ::arg().set("daemon","Operate as a daemon")="no";
     ::arg().setSwitch("write-pid","Write a PID file")="yes";
-    ::arg().set("loglevel","Amount of logging. Higher is more. Do not set below 3")="4";
+    ::arg().set("loglevel","Amount of logging. Higher is more. Do not set below 3")="6";
     ::arg().set("disable-syslog","Disable logging to syslog, useful when running inside a supervisor that logs stdout")="no";
     ::arg().set("log-common-errors","If we should log rather common errors")="no";
     ::arg().set("chroot","switch to chroot jail")="";

diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst
index c25b4f899d803c637fb8619b595136b54e76da1c..95f5246908c975282d43359c572289253ebef78f 100644 (file)
--- a/pdns/recursordist/docs/settings.rst
+++ b/pdns/recursordist/docs/settings.rst
@@ -517,7 +517,7 @@ This feature is intended to facilitate ip-failover setups, but it may also mask
 ``loglevel``
 ------------
 -  Integer between 0 and 9
--  Default: 4
+-  Default: 6
 
 Amount of logging.
 Higher is more, more logging may destroy performance.

diff --git a/pdns/recursordist/docs/upgrade.rst b/pdns/recursordist/docs/upgrade.rst
index 67a5559b633502f1904c300a2e05d8bb9adf6fe6..5a6d662f235762c5dd873778553a10c4923c0efc 100644 (file)
--- a/pdns/recursordist/docs/upgrade.rst
+++ b/pdns/recursordist/docs/upgrade.rst
@@ -4,6 +4,13 @@ Upgrade Guide
 Before upgrading, it is advised to read the :doc:`changelog/index`.
 When upgrading several versions, please read **all** notes applying to the upgrade.
 
+4.0.x to 4.1.0
+--------------
+
+:ref:`setting-max-recursion-depth` defaulted to 4 but was always overridden to 6 during
+the startup. The issue has been fixed and the default value set to 6 to keep the behavior
+consistent.
+
 4.0.3 to 4.0.4
 --------------