auth LUA shared exec: reset exec limit for every invocation

fixes #16118

(cherry picked from commit 61253c3a0302beffb3bc1040f77eb284acfc3082)

diff --git a/pdns/lua-record.cc b/pdns/lua-record.cc
index d649beaba17681f19db18a4f3b2446ce3e131dd9..cc8c235ec2de9347d2ca0720fd4844adc1842f15 100644 (file)
--- a/pdns/lua-record.cc
+++ b/pdns/lua-record.cc
@@ -1635,10 +1635,6 @@ static void setupLuaRecords(LuaContext& lua)
       lua_report(event, line);
     });
 
-  if (g_luaRecordExecLimit > 0) {
-    lua.executeCode(boost::str(boost::format("debug.sethook(report, '', %d)") % g_luaRecordExecLimit));
-  }
-
   lua.writeFunction("latlon", []() -> string {
       return lua_latlon();
     });
@@ -1800,6 +1796,10 @@ std::vector<shared_ptr<DNSRecordContent>> luaSynth(const std::string& code, cons
   }
   lua.writeVariable("bestwho", s_lua_record_ctx->bestwho);
 
+  if (g_luaRecordExecLimit > 0) {
+    lua.executeCode(boost::str(boost::format("debug.sethook(report, '', %d)") % g_luaRecordExecLimit));
+  }
+
   try {
     string actual;
     if(!code.empty() && code[0]!=';')

diff --git a/regression-tests.auth-py/test_LuaRecords.py b/regression-tests.auth-py/test_LuaRecords.py
index 6ea2ef1622842fd1bf2416269c8961be9f2f9837..b79b7c6a9d8fc7c5a47462dfb375535c19c45fe8 100644 (file)
--- a/regression-tests.auth-py/test_LuaRecords.py
+++ b/regression-tests.auth-py/test_LuaRecords.py
@@ -1250,7 +1250,6 @@ any-to-tcp=no
 enable-lua-records=shared
 lua-records-insert-whitespace=yes
 lua-health-checks-interval=1
-lua-records-exec-limit=1500
 """
 
     def testCounter(self):