Commit f3c8e48b authored by Evan Hunt's avatar Evan Hunt
Browse files

[master] change RRL log category 'query-errors'

3575.	[func]		Changed the logging category for RRL events from
			'queries' to 'query-errors'. [RT #33540]
parent f9ed68cc
3575. [func] Changed the logging category for RRL events from
'queries' to 'query-errors'. [RT #33540]
3574. [doc] The 'hostname' keyword was missing from server-id
description in the named.conf man page. [RT #33476]
......
......@@ -1235,8 +1235,7 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
INSIST(rcode != dns_rcode_noerror &&
rcode != dns_rcode_nxdomain);
wouldlog = (ns_g_server->log_queries &&
isc_log_wouldlog(ns_g_lctx, DNS_RRL_LOG_DROP));
wouldlog = isc_log_wouldlog(ns_g_lctx, DNS_RRL_LOG_DROP);
rrl_result = dns_rrl(client->view, &client->peeraddr,
TCP_CLIENT(client),
dns_rdataclass_in, dns_rdatatype_none,
......@@ -1250,7 +1249,8 @@ ns_client_error(ns_client_t *client, isc_result_t result) {
* NS_LOGCATEGORY_RRL.
*/
if (wouldlog) {
ns_client_log(client, NS_LOGCATEGORY_QUERIES,
ns_client_log(client,
NS_LOGCATEGORY_QUERY_EERRORS,
NS_LOGMODULE_CLIENT,
DNS_RRL_LOG_DROP,
"%s", log_buf);
......
......@@ -6323,9 +6323,10 @@ query_find(ns_client_t *client, dns_fetchevent_t *event, dns_rdatatype_t qtype)
* in QryDropped while slipped responses are counted
* with other truncated responses in RespTruncated.
*/
if (wouldlog && ns_g_server->log_queries) {
ns_client_log(client, NS_LOGCATEGORY_QUERIES,
NS_LOGMODULE_CLIENT,
if (wouldlog) {
ns_client_log(client,
NS_LOGCATEGORY_QUERY_EERRORS,
NS_LOGMODULE_QUERY,
DNS_RRL_LOG_DROP,
"%s", log_buf);
}
......
......@@ -4938,9 +4938,7 @@ category notify { null; };
</para>
<para>
Rate limiting of individual requests
is logged in the <command>queries</command> category
and can be controlled with the
<command>querylog</command> option.
is logged in the <command>query-errors</command> category.
</para>
</entry>
</row>
......
......@@ -1219,7 +1219,8 @@ dns_rrl(dns_view_t *view,
* Make a log message for the caller.
*/
if (wouldlog)
make_log_buf(rrl, e, rrl->log_only ? "would " : NULL,
make_log_buf(rrl, e,
rrl->log_only ? "would rate limit " : "rate limit ",
NULL, ISC_FALSE, qname, ISC_FALSE,
rrl_result, resp_result, log_buf, log_buf_len);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment