From: Remi Gacogne <remi.gacogne@powerdns.com>
Date: Thu, 8 Feb 2024 09:43:56 +0000 (+0100)
Subject: dnsdist: Apply suggestions from code review, delint
X-Git-Tag: dnsdist-1.9.0~9^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F13768%2Fhead;p=thirdparty%2Fpdns.git

dnsdist: Apply suggestions from code review, delint
---

diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index f30ee44f21..6f0d4080ab 100644
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -2228,21 +2228,21 @@ pdns::stat16_t g_cacheCleaningPercentage{100};
 static void maintThread()
 {
   setThreadName("dnsdist/main");
-  int interval = 1;
+  constexpr int interval = 1;
   size_t counter = 0;
   int32_t secondsToWaitLog = 0;
 
   for (;;) {
-    sleep(interval);
+    std::this_thread::sleep_for(std::chrono::seconds(interval));
 
     {
       auto lua = g_lua.lock();
       try {
-        auto f = lua->readVariable<boost::optional<std::function<void()> > >("maintenance");
-        if (f) {
-          (*f)();
+        auto maintenanceCallback = lua->readVariable<boost::optional<std::function<void()> > >("maintenance");
+        if (maintenanceCallback) {
+          (*maintenanceCallback)();
         }
-        dnsdist::lua::hooks::runMaintenanceHook(*lua);
+        dnsdist::lua::hooks::runMaintenanceHooks(*lua);
         secondsToWaitLog = 0;
       }
       catch (const std::exception &e) {
@@ -2737,7 +2737,7 @@ static void cleanupLuaObjects()
   g_policy.setState(ServerPolicy());
   g_pools.setState({});
   clearWebHandlers();
-  dnsdist::lua::hooks::clearMaintenanceHook();
+  dnsdist::lua::hooks::clearMaintenanceHooks();
 }
 
 static void sigTermHandler(int)
diff --git a/pdns/dnsdistdist/dnsdist-lua-hooks.cc b/pdns/dnsdistdist/dnsdist-lua-hooks.cc
index 0044417b95..c5ccb48915 100644
--- a/pdns/dnsdistdist/dnsdist-lua-hooks.cc
+++ b/pdns/dnsdistdist/dnsdist-lua-hooks.cc
@@ -5,12 +5,12 @@
 
 namespace dnsdist::lua::hooks
 {
-static LockGuarded<std::vector<MaintenanceCallback>> s_maintenanceHook;
+static LockGuarded<std::vector<MaintenanceCallback>> s_maintenanceHooks;
 
-void runMaintenanceHook(const LuaContext& context)
+void runMaintenanceHooks(const LuaContext& context)
 {
   (void)context;
-  for (const auto& callback : *(s_maintenanceHook.lock())) {
+  for (const auto& callback : *(s_maintenanceHooks.lock())) {
     callback();
   }
 }
@@ -18,12 +18,12 @@ void runMaintenanceHook(const LuaContext& context)
 void addMaintenanceCallback(const LuaContext& context, MaintenanceCallback callback)
 {
   (void)context;
-  s_maintenanceHook.lock()->push_back(std::move(callback));
+  s_maintenanceHooks.lock()->push_back(std::move(callback));
 }
 
-void clearMaintenanceHook()
+void clearMaintenanceHooks()
 {
-  s_maintenanceHook.lock()->clear();
+  s_maintenanceHooks.lock()->clear();
 }
 
 void setupLuaHooks(LuaContext& luaCtx)
diff --git a/pdns/dnsdistdist/dnsdist-lua-hooks.hh b/pdns/dnsdistdist/dnsdist-lua-hooks.hh
index 993d3a9c42..03f1ac4ec4 100644
--- a/pdns/dnsdistdist/dnsdist-lua-hooks.hh
+++ b/pdns/dnsdistdist/dnsdist-lua-hooks.hh
@@ -28,8 +28,8 @@ class LuaContext;
 namespace dnsdist::lua::hooks
 {
 using MaintenanceCallback = std::function<void()>;
-void runMaintenanceHook(const LuaContext& context);
+void runMaintenanceHooks(const LuaContext& context);
 void addMaintenanceCallback(MaintenanceCallback callback);
-void clearMaintenanceHook();
+void clearMaintenanceHooks();
 void setupLuaHooks(LuaContext& luaCtx);
 }