change default timeout to 2s for lua records

diff --git a/docs/upgrading.rst b/docs/upgrading.rst
index 258d3f9d6d5e8be21199a3db71c1cd8d833f68e9..9671625b5d29df65de750be29aa6b025740aaf9c 100644 (file)
--- a/docs/upgrading.rst
+++ b/docs/upgrading.rst
@@ -36,6 +36,11 @@ Their old names still work in 4.5.x, but will be removed in the release after it
 * :ref:`setting-slave` is now :ref:`setting-secondary`
 * :ref:`setting-superslave` is now :ref:`setting-autosecondary`
 
+Changed defaults
+~~~~~~~~~~~~~~~~
+
+- The default value of the ``timeout`` option for :ref:`ifportup` and :ref:`ifurlup` functions has been changed from ``1`` to ``2`` seconds.
+
 4.3.x to 4.4.0
 --------------
 

diff --git a/pdns/lua-record.cc b/pdns/lua-record.cc
index 31d4647ac286148229d39d65d16d57b2f8d6a733..a4e4eac11a1ec0110dd031934be2939a7aabddfe 100644 (file)
--- a/pdns/lua-record.cc
+++ b/pdns/lua-record.cc
@@ -89,7 +89,7 @@ private:
   void checkURL(const CheckDesc& cd, const bool status, const bool first = false)
   {
     try {
-      int timeout = 1;
+      int timeout = 2;
       if (cd.opts.count("timeout")) {
         timeout = std::atoi(cd.opts.at("timeout").c_str());
       }
@@ -123,7 +123,7 @@ private:
   }
   void checkTCP(const CheckDesc& cd, const bool status, const bool first = false) {
     try {
-      int timeout = 1;
+      int timeout = 2;
       if (cd.opts.count("timeout")) {
         timeout = std::atoi(cd.opts.at("timeout").c_str());
       }