From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 30 Sep 2021 13:49:23 +0000 (+0200)
Subject: dnsdist: Clean up Lua objects before exiting, in coverage mode
X-Git-Tag: dnsdist-1.7.0-alpha2~10^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ac9082e686ac5a5268f2caeebc6afc1b0415642;p=thirdparty%2Fpdns.git

dnsdist: Clean up Lua objects before exiting, in coverage mode
---

diff --git a/pdns/dnsdist-web.cc b/pdns/dnsdist-web.cc
index 5fc86119c6..d70d60c92c 100644
--- a/pdns/dnsdist-web.cc
+++ b/pdns/dnsdist-web.cc
@@ -1324,6 +1324,11 @@ void registerWebHandler(const std::string& endpoint, std::function<void(const Ya
   s_webHandlers[endpoint] = handler;
 }
 
+void clearWebHandlers()
+{
+  s_webHandlers.clear();
+}
+
 static void redirectToIndex(const YaHTTP::Request& req, YaHTTP::Response& resp)
 {
   const string charset = "; charset=utf-8";
diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index 5684922cc7..306446f814 100644
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -2176,8 +2176,22 @@ static void usage()
 }
 
 #ifdef COVERAGE
+static void cleanupLuaObjects()
+{
+  /* when our coverage mode is enabled, we need to make
+     that the Lua objects destroyed before the Lua contexts. */
+  g_ruleactions.setState({});
+  g_respruleactions.setState({});
+  g_cachehitrespruleactions.setState({});
+  g_selfansweredrespruleactions.setState({});
+  g_dstates.setState({});
+  g_policy.setState(ServerPolicy());
+  clearWebHandlers();
+}
+
 static void sighandler(int sig)
 {
+  cleanupLuaObjects();
   exit(EXIT_SUCCESS);
 }
 #endif
@@ -2408,6 +2422,7 @@ int main(int argc, char** argv)
       // No exception was thrown
       infolog("Configuration '%s' OK!", g_cmdLine.config);
 #ifdef COVERAGE
+      cleanupLuaObjects();
       exit(EXIT_SUCCESS);
 #else
       _exit(EXIT_SUCCESS);
@@ -2661,6 +2676,7 @@ int main(int argc, char** argv)
       doConsole();
     }
 #ifdef COVERAGE
+    cleanupLuaObjects();
     exit(EXIT_SUCCESS);
 #else
     _exit(EXIT_SUCCESS);
diff --git a/pdns/dnsdistdist/dnsdist-web.hh b/pdns/dnsdistdist/dnsdist-web.hh
index 110d638d07..fea62bedff 100644
--- a/pdns/dnsdistdist/dnsdist-web.hh
+++ b/pdns/dnsdistdist/dnsdist-web.hh
@@ -12,3 +12,4 @@ void setWebserverMaxConcurrentConnections(size_t);
 void dnsdistWebserverThread(int sock, const ComboAddress& local);
 
 void registerBuiltInWebHandlers();
+void clearWebHandlers();