From: Otto <otto.moerbeek@open-xchange.com>
Date: Wed, 25 Aug 2021 10:13:40 +0000 (+0200)
Subject: Spello's, better names for settings
X-Git-Tag: rec-4.6.0-alpha1~2^2~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=87af21f653148562eda122a217dfa84a0f64e06c;p=thirdparty%2Fpdns.git

Spello's, better names for settings
---

diff --git a/pdns/pdns_recursor.cc b/pdns/pdns_recursor.cc
index 10b3219b3e..5fae14c11f 100644
--- a/pdns/pdns_recursor.cc
+++ b/pdns/pdns_recursor.cc
@@ -5065,11 +5065,11 @@ static int serviceMain(int argc, char*argv[])
     TCPConnection::s_maxInFlight = maxInFlight;
   }
 
-  int64_t millis = ::arg().asNum("tcpout-maxidle-ms");
+  int64_t millis = ::arg().asNum("tcp-out-max-idle-ms");
   TCPOutConnectionManager::maxIdleTime = timeval{millis / 1000, (millis % 1000) * 1000 };
-  TCPOutConnectionManager::maxIdlePerAuth = ::arg().asNum("tcpout-maxidle-per-auth");
-  TCPOutConnectionManager::maxQueries = ::arg().asNum("tcpout-max-queries");
-  TCPOutConnectionManager::maxIdlePerThread = ::arg().asNum("tcpout-maxidle-per-thread");
+  TCPOutConnectionManager::maxIdlePerAuth = ::arg().asNum("tcp-out-max-idle-per-auth");
+  TCPOutConnectionManager::maxQueries = ::arg().asNum("tcp-out-max-queries");
+  TCPOutConnectionManager::maxIdlePerThread = ::arg().asNum("tcp-out-max-idle-per-thread");
 
   g_gettagNeedsEDNSOptions = ::arg().mustDo("gettag-needs-edns-options");
 
@@ -5942,10 +5942,10 @@ int main(int argc, char **argv)
     ::arg().setSwitch("dot-to-port-853", "Force DoT connection to target port 853 if DoT compiled in")="yes";
     ::arg().set("dot-to-auth-names", "Use DoT to authoritative servers with these names or suffixes")="";
 
-    ::arg().set("tcpout-maxidle-ms", "Time TCP/DoT connections are left idle in milliseconds or 0 if no limit") = "10000";
-    ::arg().set("tcpout-maxidle-per-auth", "Maximum number of idle TCP/DoT connections to a specific IP per thread, 0 means do not keep idle connections open") = "10";
-    ::arg().set("tcpout-max-queries", "Maximum total number of queries per TCP/DoT connection, 0 means no limit") = "0";
-    ::arg().set("tcpout-maxidle-per-thread", "Maximum number of idle TCP/DoT connections per thread") = "100";
+    ::arg().set("tcp-out-max-idle-ms", "Time TCP/DoT connections are left idle in milliseconds or 0 if no limit") = "10000";
+    ::arg().set("tcp-out-max-idle-per-auth", "Maximum number of idle TCP/DoT connections to a specific IP per thread, 0 means do not keep idle connections open") = "10";
+    ::arg().set("tcp-out-max-queries", "Maximum total number of queries per TCP/DoT connection, 0 means no limit") = "0";
+    ::arg().set("tcp-out-max-idle-per-thread", "Maximum number of idle TCP/DoT connections per thread") = "100";
 
     ::arg().setCmd("help","Provide a helpful message");
     ::arg().setCmd("version","Print version string");
diff --git a/pdns/recursordist/docs/settings.rst b/pdns/recursordist/docs/settings.rst
index 530f44e2be..edbc9e794e 100644
--- a/pdns/recursordist/docs/settings.rst
+++ b/pdns/recursordist/docs/settings.rst
@@ -1887,16 +1887,16 @@ The numerical value supplied is used as the queue size, 0 meaning disabled. See
 
 Enable TCP Fast Open Connect support, if available, on the outgoing connections to authoritative servers. See :ref:`tcp-fast-open-support`.
 
-``tcpout-maxidle-ms``
+``tcp-out-max-idle-ms``
 ---------------------
 .. versionadded:: 4.6.0
 
 -  Integer
 -  Default : 10000
 
-Time outgoing TCP/DoT connections are left idle in milliseconds or 0 if no limit. After having been idle for this time, the connection is elegible for closing.
+Time outgoing TCP/DoT connections are left idle in milliseconds or 0 if no limit. After having been idle for this time, the connection is eligible for closing.
 
-``tcpout-maxidle-per-auth``
+``tcp-out-max-idle-per-auth``
 ---------------------------
 .. versionadded:: 4.6.0
 
@@ -1905,17 +1905,17 @@ Time outgoing TCP/DoT connections are left idle in milliseconds or 0 if no limit
 
 Maximum number of idle outgoing TCP/DoT connections to a specific IP per thread, 0 means do not keep idle connections open.
 
-``tcpout-max-queries``
+``tcp-out-max-queries``
 ----------------------
 -  Integer
 -  Default : 0
 
-Maximum total number of queries per outgoing TCP/DoT connection, 0 means no limit. After this number of queries, the concection is
+Maximum total number of queries per outgoing TCP/DoT connection, 0 means no limit. After this number of queries, the connection is
 closed and a new one will be created if needed.
 
 .. versionadded:: 4.6.0
 
-``tcpout-maxidle-per-thread``
+``tcp-out-max-idle-per-thread``
 -----------------------------
 .. versionadded:: 4.6.0