From: Daniel Salzman <daniel.salzman@nic.cz>
Date: Thu, 24 Aug 2023 16:36:25 +0000 (+0200)
Subject: server: use log_enabled_debug() in handlers where appropriate
X-Git-Tag: v3.4.dev~11
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8ad3dfbb943dec802bcfa09feba0254966e34c1f;p=thirdparty%2Fknot-dns.git

server: use log_enabled_debug() in handlers where appropriate
---

diff --git a/src/knot/server/tcp-handler.c b/src/knot/server/tcp-handler.c
index 177766d35d..7b07fa5b28 100644
--- a/src/knot/server/tcp-handler.c
+++ b/src/knot/server/tcp-handler.c
@@ -98,7 +98,7 @@ static fdset_sweep_state_t tcp_sweep(fdset_t *set, int fd, _unused_ void *data)
 static void tcp_log_error(const struct sockaddr_storage *ss, const char *operation, int ret)
 {
 	/* Don't log ECONN as it usually means client closed the connection. */
-	if (ret == KNOT_ETIMEOUT) {
+	if (ret == KNOT_ETIMEOUT && log_enabled_debug()) {
 		char addr_str[SOCKADDR_STRLEN];
 		sockaddr_tostr(addr_str, sizeof(addr_str), ss);
 		log_debug("TCP, failed to %s due to IO timeout, closing connection, address %s",
diff --git a/src/knot/server/udp-handler.c b/src/knot/server/udp-handler.c
index d85c2f337a..0305b1554a 100644
--- a/src/knot/server/udp-handler.c
+++ b/src/knot/server/udp-handler.c
@@ -262,7 +262,7 @@ static void udp_msg_send(void *d)
 
 	if (rq->iov[TX].iov_len > 0) {
 		int ret = sendmsg(rq->fd, &rq->msg[TX], 0);
-		if (ret == -1) {
+		if (ret == -1 && log_enabled_debug()) {
 			log_debug("UDP, failed to send a packet (%s)", strerror(errno));
 		}
 	}
@@ -387,7 +387,7 @@ static void udp_mmsg_send(void *d)
 	udp_mmsg_ctx_t *rq = d;
 
 	int ret = sendmmsg(rq->fd, rq->msgs[TX], rq->rcvd, 0);
-	if (ret == -1) {
+	if (ret == -1 && log_enabled_debug()) {
 		log_debug("UDP, failed to send some packets (%s)", strerror(errno));
 	}
 	for (unsigned i = 0; i < rq->rcvd; ++i) {
diff --git a/src/knot/server/xdp-handler.c b/src/knot/server/xdp-handler.c
index 341310f63c..2dbd8fb095 100644
--- a/src/knot/server/xdp-handler.c
+++ b/src/knot/server/xdp-handler.c
@@ -303,13 +303,13 @@ void xdp_handle_send(xdp_handle_ctx_t *ctx)
 {
 	uint32_t unused;
 	int ret = knot_xdp_send(ctx->sock, ctx->msg_send_udp, ctx->msg_udp_count, &unused);
-	if (ret != KNOT_EOK) {
+	if (ret != KNOT_EOK && log_enabled_debug()) {
 		log_debug("UDP/XDP, failed to send some packets");
 	}
 	if (ctx->tcp) {
 		ret = knot_tcp_send(ctx->sock, ctx->relays, ctx->msg_recv_count,
 		                    XDP_BATCHLEN);
-		if (ret != KNOT_EOK) {
+		if (ret != KNOT_EOK && log_enabled_debug()) {
 			log_debug("TCP/XDP, failed to send some packets");
 		}
 	}
@@ -321,7 +321,7 @@ void xdp_handle_send(xdp_handle_ctx_t *ctx)
 
 		ret = knot_quic_send(ctx->quic_table, ctx->quic_relays[i],
 		                     &ctx->quic_replies[i], QUIC_MAX_SEND_PER_RECV, 0);
-		if (ret != KNOT_EOK) {
+		if (ret != KNOT_EOK && log_enabled_debug()) {
 			log_debug("QUIC/XDP, failed to send some packets");
 		}
 	}