Skip zone cache refresh logic if disabled.

Signed-off-by: Miod Vallat <miod.vallat@powerdns.com>

Author: miodvallat

pdns/auth-main.cc

@@ -967,19 +967,21 @@ static void mainthread()
 
   // Setup the zone cache
   g_zoneCache.setRefreshInterval(::arg().asNum("zone-cache-refresh-interval"));
-  try {
-    UeberBackend B;
-    B.updateZoneCache();
-  }
-  catch (PDNSException& e) {
-    SLOG(g_log << Logger::Error << "PDNSException while filling the zone cache: " << e.reason << endl,
-         slog->error(Logr::Error, e.reason, "PDNSException while filling the zone cache"));
-    exit(1);
-  }
-  catch (std::exception& e) {
-    SLOG(g_log << Logger::Error << "STL Exception while filling the zone cache: " << e.what() << endl,
-         slog->error(Logr::Error, e.what(), "STL Exception while filling the zone cache"));
-    exit(1);
+  if (g_zoneCache.getRefreshInterval() != 0) {
+    try {
+      UeberBackend B;
+      B.updateZoneCache();
+    }
+    catch (PDNSException& e) {
+      SLOG(g_log << Logger::Error << "PDNSException while filling the zone cache: " << e.reason << endl,
+           slog->error(Logr::Error, e.reason, "PDNSException while filling the zone cache"));
+      exit(1);
+    }
+    catch (std::exception& e) {
+      SLOG(g_log << Logger::Error << "STL Exception while filling the zone cache: " << e.what() << endl,
+           slog->error(Logr::Error, e.what(), "STL Exception while filling the zone cache"));
+      exit(1);
+    }
   }
 
   // NOW SAFE TO CREATE THREADS!
@@ -1016,23 +1018,26 @@ static void mainthread()
   uint32_t secpollSince = 0;
   uint32_t zoneCacheUpdateSince = 0;
   for (;;) {
-    const uint32_t sleeptime = g_zoneCache.getRefreshInterval() == 0 ? secpollInterval : std::min(secpollInterval, g_zoneCache.getRefreshInterval());
+    auto zoneCacheRefresh = g_zoneCache.getRefreshInterval();
+    const uint32_t sleeptime = zoneCacheRefresh == 0 ? secpollInterval : std::min(secpollInterval, zoneCacheRefresh);
     sleep(sleeptime); // if any signals arrive, we might run more often than expected.
 
-    zoneCacheUpdateSince += sleeptime;
-    if (zoneCacheUpdateSince >= g_zoneCache.getRefreshInterval()) {
-      try {
-        UeberBackend B;
-        B.updateZoneCache();
-        zoneCacheUpdateSince = 0;
-      }
-      catch (PDNSException& e) {
-        SLOG(g_log << Logger::Error << "PDNSException while updating zone cache: " << e.reason << endl,
-             slog->error(Logr::Error, e.reason, "PDNSException while updating the zone cache"));
-      }
-      catch (std::exception& e) {
-        SLOG(g_log << Logger::Error << "STL Exception while updating zone cache: " << e.what() << endl,
-             slog->error(Logr::Error, e.what(), "STL Exception while updating the zone cache"));
+    if (zoneCacheRefresh != 0) {
+      zoneCacheUpdateSince += sleeptime;
+      if (zoneCacheUpdateSince >= zoneCacheRefresh) {
+        try {
+          UeberBackend B;
+          B.updateZoneCache();
+          zoneCacheUpdateSince = 0;
+        }
+        catch (PDNSException& e) {
+          SLOG(g_log << Logger::Error << "PDNSException while updating zone cache: " << e.reason << endl,
+               slog->error(Logr::Error, e.reason, "PDNSException while updating the zone cache"));
+        }
+        catch (std::exception& e) {
+          SLOG(g_log << Logger::Error << "STL Exception while updating zone cache: " << e.what() << endl,
+               slog->error(Logr::Error, e.what(), "STL Exception while updating the zone cache"));
+        }
       }
     }