From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Mon, 7 Oct 2024 09:49:22 +0000 (+0200)
Subject: Merge pull request #14611 from omoerbeek/rec-log-moadns-exception
X-Git-Tag: rec-5.2.0-alpha1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec0e381c27ad233a6cde5eeb62706d778b44bc17;p=thirdparty%2Fpdns.git

Merge pull request #14611 from omoerbeek/rec-log-moadns-exception

rec: Only log MOADNSExceptions if logging.log_common_errors is true.
---

ec0e381c27ad233a6cde5eeb62706d778b44bc17
diff --cc pdns/recursordist/rec-main.cc
index e4c728e2b4,4a5a3b852c..8175042ce6
--- a/pdns/recursordist/rec-main.cc
+++ b/pdns/recursordist/rec-main.cc
@@@ -2785,15 -2811,17 +2790,15 @@@ static void recLoop(
        auto timeoutUsec = g_multiTasker->nextWaiterDelayUsec(500000);
        t_fdm->run(&g_now, static_cast<int>(timeoutUsec / 1000));
        // 'run' updates g_now for us
 -
 -      runTCPMaintenance(threadInfo, listenOnTCP, maxTcpClients);
      }
      catch (const PDNSException& pdnsException) {
-       s_rateLimitedLogger.log(g_slog->withName("runtime"), "recLoop", pdnsException);
+       g_rateLimitedLogger.log(g_slog->withName("runtime"), "recLoop", pdnsException);
      }
      catch (const std::exception& stdException) {
-       s_rateLimitedLogger.log(g_slog->withName("runtime"), "recLoop", stdException);
+       g_rateLimitedLogger.log(g_slog->withName("runtime"), "recLoop", stdException);
      }
      catch (...) {
-       s_rateLimitedLogger.log(g_slog->withName("runtime"), "recLoop");
+       g_rateLimitedLogger.log(g_slog->withName("runtime"), "recLoop");
      }
    }
  }