Move serve-stale logging to its own category, so that its verbosity can be curtailed.

diff --git a/doc/arm/logging-categories.xml b/doc/arm/logging-categories.xml
index 216ac77fab8338ca103033cc63b0bea193f15ded..9d3856d4448f4fa490c8bb045fa7b7b715239a3e 100644 (file)
--- a/doc/arm/logging-categories.xml
+++ b/doc/arm/logging-categories.xml
@@ -315,6 +315,17 @@
          </para>
        </entry>
       </row>
+      <row rowsep="0">
+       <entry colname="1">
+         <para><command>serve-stale</command></para>
+       </entry>
+       <entry colname="2">
+         <para>
+           Whether or not a stale answer is used
+           following a resolver failure.
+         </para>
+       </entry>
+      </row>
       <row rowsep="0">
        <entry colname="1">
          <para><command>spill</command></para>

diff --git a/lib/ns/include/ns/log.h b/lib/ns/include/ns/log.h
index dd81f64a5b44521860c884b9c6f86f2be946c368..aab57aca091cf97858e8c6bee4549d06503457b7 100644 (file)
--- a/lib/ns/include/ns/log.h
+++ b/lib/ns/include/ns/log.h
@@ -28,6 +28,7 @@ LIBNS_EXTERNAL_DATA extern isc_logmodule_t ns_modules[];
 #define NS_LOGCATEGORY_UPDATE_SECURITY (&ns_categories[4])
 #define NS_LOGCATEGORY_QUERY_ERRORS    (&ns_categories[5])
 #define NS_LOGCATEGORY_TAT             (&ns_categories[6])
+#define NS_LOGCATEGORY_SERVE_STALE     (&ns_categories[7])
 
 /*
  * Backwards compatibility.

diff --git a/lib/ns/log.c b/lib/ns/log.c
index 636e457bc377ad193d0c7d3f5919c3dedc23331b..0a321d15a49c710393cba4f7f6ba13e419df115b 100644 (file)
--- a/lib/ns/log.c
+++ b/lib/ns/log.c
@@ -34,6 +34,7 @@ LIBNS_EXTERNAL_DATA isc_logcategory_t ns_categories[] = {
        { "update-security",            0 },
        { "query-errors",               0 },
        { "trust-anchor-telemetry",     0 },
+       { "serve-stale",                0 },
        { NULL,                         0 }
 };
 

diff --git a/lib/ns/query.c b/lib/ns/query.c
index f147baa20229a96e1d706b8cf8bcbb08c94c3a3a..a656ad7099f8e8c47a9755b1b55a562f791f009b 100644 (file)
--- a/lib/ns/query.c
+++ b/lib/ns/query.c
@@ -5493,7 +5493,7 @@ query_lookup(query_ctx_t *qctx) {
 
                dns_name_format(qctx->client->query.qname,
                                namebuf, sizeof(namebuf));
-               isc_log_write(ns_lctx, NS_LOGCATEGORY_GENERAL,
+               isc_log_write(ns_lctx, NS_LOGCATEGORY_SERVE_STALE,
                              NS_LOGMODULE_QUERY, ISC_LOG_INFO,
                              "%s resolver failure, stale answer %s",
                              namebuf, success ? "used" : "unavailable");