Merge pull request #14909 from omoerbeek/rec-startstop-fix

re: followup to 14796: also call stop hook in 1 thread case
PowerDNS · Dec 2, 2024 · 374a7d3 · 374a7d3
2 parents 85dfaa0 + 71a9a0f
commit 374a7d3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/pdns/recursordist/rec-main.cc b/pdns/recursordist/rec-main.cc
@@ -356,7 +356,6 @@ int RecThreadInfo::runThreads(Logr::log_t log)
         ret = tInfo.exitCode;
       }
     }
-    runStartStopLua(false, log);
   }
   return ret;
 }
@@ -2390,8 +2389,9 @@ static int serviceMain(Logr::log_t log)
 #endif /* NOD_ENABLED */
 
   runStartStopLua(true, log);
-
-  return RecThreadInfo::runThreads(log);
+  ret = RecThreadInfo::runThreads(log);
+  runStartStopLua(false, log);
+  return ret;
 }
 
 static void handlePipeRequest(int fileDesc, FDMultiplexer::funcparam_t& /* var */)