Don't exit dnsdist on an exception in maintenance

This change logs every minute if the maintenance function throws an
exception.

diff --git a/pdns/dnsdist.cc b/pdns/dnsdist.cc
index e3901315161a7cbf2496d34ba83918767e895138..6ea4b1a39a4a8ff2073a3844869180d7bbccf6f3 100644 (file)
--- a/pdns/dnsdist.cc
+++ b/pdns/dnsdist.cc
@@ -1247,15 +1247,27 @@ void* maintThread()
 {
   int interval = 1;
   size_t counter = 0;
+  int32_t secondsToWaitLog = 0;
 
   for(;;) {
     sleep(interval);
 
     {
       std::lock_guard<std::mutex> lock(g_luamutex);
-      auto f =g_lua.readVariable<boost::optional<std::function<void()> > >("maintenance");
-      if(f)
-        (*f)();
+      auto f = g_lua.readVariable<boost::optional<std::function<void()> > >("maintenance");
+      if(f) {
+        try {
+          (*f)();
+          secondsToWaitLog = 0;
+        }
+        catch(std::exception &e) {
+          if (secondsToWaitLog <= 0) {
+            infolog("Error during execution of maintenance function: %s", e.what());
+            secondsToWaitLog = 61;
+          }
+          secondsToWaitLog -= interval;
+        }
+      }
     }
 
     counter++;