]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge pull request #14611 from omoerbeek/rec-log-moadns-exception
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Mon, 7 Oct 2024 09:49:22 +0000 (11:49 +0200)
committerGitHub <noreply@github.com>
Mon, 7 Oct 2024 09:49:22 +0000 (11:49 +0200)
rec: Only log MOADNSExceptions if logging.log_common_errors is true.

1  2 
pdns/recursordist/pdns_recursor.cc
pdns/recursordist/rec-main.cc
pdns/recursordist/rec-main.hh
pdns/recursordist/rec-tcp.cc

Simple merge
index e4c728e2b49f4324b0b15479c068b900be36c049,4a5a3b852ce8d6dcc744859864d6bf6508f2cb77..8175042ce674ed0d529d41d8fff4fa994c899fc8
@@@ -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");
      }
    }
  }
Simple merge
Simple merge