]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
Differentiate between initial and cumulative fetch limit logging
authorAram Sargsyan <aram@isc.org>
Fri, 22 Jul 2022 08:01:17 +0000 (08:01 +0000)
committerAram Sargsyan <aram@isc.org>
Mon, 1 Aug 2022 14:42:27 +0000 (14:42 +0000)
Cumulative fetch limit logging happens on an event of a dropped
fetch if 60 seconds have been passed since the previous log message.
This change makes the log message different for the initial event
and for the later cumulative events to provide more useful information
to the system administrator.

lib/dns/resolver.c

index 8001b649a9a22671fba141afaa6ff8d92af7af14..f153e54d4d3c772ec9abc3a5b67ced55e8b4c087 100644 (file)
@@ -1591,8 +1591,11 @@ fcount_logspill(fetchctx_t *fctx, fctxcount_t *counter, bool final) {
                isc_log_write(dns_lctx, DNS_LOGCATEGORY_SPILL,
                              DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,
                              "too many simultaneous fetches for %s "
-                             "(allowed %d spilled %d)",
-                             dbuf, counter->allowed, counter->dropped);
+                             "(allowed %d spilled %d; %s)",
+                             dbuf, counter->allowed, counter->dropped,
+                             counter->dropped == 1 ? "initial trigger event"
+                                                   : "cumulative since "
+                                                     "initial trigger event");
        } else {
                isc_log_write(dns_lctx, DNS_LOGCATEGORY_SPILL,
                              DNS_LOGMODULE_RESOLVER, ISC_LOG_INFO,