dnsdist: Clear the Lua maintenance callbacks before exiting

rgacogne · Feb 6, 2024 · 7bee5de · 7bee5de
1 parent 5798dc9
commit 7bee5de
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
@@ -2737,6 +2737,7 @@ static void cleanupLuaObjects()
   g_policy.setState(ServerPolicy());
   g_pools.setState({});
   clearWebHandlers();
+  dnsdist::lua::hooks::clearMaintenanceHook();
 }
 
 static void sigTermHandler(int)

diff --git a/pdns/dnsdistdist/dnsdist-lua-hooks.cc b/pdns/dnsdistdist/dnsdist-lua-hooks.cc
@@ -21,6 +21,11 @@ void addMaintenanceCallback(const LuaContext& context, MaintenanceCallback callb
   s_maintenanceHook.lock()->push_back(std::move(callback));
 }
 
+void clearMaintenanceHook()
+{
+  s_maintenanceHook.lock()->clear();
+}
+
 void setupLuaHooks(LuaContext& luaCtx)
 {
   luaCtx.writeFunction("addMaintenanceCallback", [&luaCtx](const MaintenanceCallback& callback) {

diff --git a/pdns/dnsdistdist/dnsdist-lua-hooks.hh b/pdns/dnsdistdist/dnsdist-lua-hooks.hh
@@ -30,5 +30,6 @@ namespace dnsdist::lua::hooks
 using MaintenanceCallback = std::function<void()>;
 void runMaintenanceHook(const LuaContext& context);
 void addMaintenanceCallback(MaintenanceCallback callback);
+void clearMaintenanceHook();
 void setupLuaHooks(LuaContext& luaCtx);
 }