From 98bcadd00c668e82df4c22636930410be60cb318 Mon Sep 17 00:00:00 2001 From: Stanislav Chzhen Date: Wed, 6 Mar 2024 17:09:06 +0300 Subject: [PATCH] Pull request 2160: AG-30904-fix-ip-in-logs Squashed commit of the following: commit 0a54ca2746dac7a21d05265f26c161df763af7d8 Merge: 1d30c0995 5565b9e1c Author: Stanislav Chzhen Date: Wed Mar 6 16:19:36 2024 +0300 Merge branch 'master' into AG-30904-fix-ip-in-logs commit 1d30c099577bda192609049bab4510cf6f69a972 Author: Stanislav Chzhen Date: Tue Mar 5 17:14:02 2024 +0300 all: missing ip in logs --- CHANGELOG.md | 2 ++ internal/dnsforward/stats.go | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 32c2ce9a..72f8f825 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -61,6 +61,8 @@ NOTE: Add new changes BELOW THIS COMMENT. ### Fixed +- Missing IP addresses in logs when querying for domain names from the ignore + lists. - Wrong algorithm for caching bootstrapped upstream addresses ([#6723]). - Incorrect tracking of the system hosts file's changes ([#6711]). diff --git a/internal/dnsforward/stats.go b/internal/dnsforward/stats.go index 6a6b9853..220f151c 100644 --- a/internal/dnsforward/stats.go +++ b/internal/dnsforward/stats.go @@ -46,7 +46,7 @@ func (s *Server) processQueryLogsAndStats(dctx *dnsContext) (rc resultCode) { dns.Class(cl), dns.Type(qt), host, - ip, + ipStr, ) } @@ -58,7 +58,7 @@ func (s *Server) processQueryLogsAndStats(dctx *dnsContext) (rc resultCode) { dns.Class(cl), dns.Type(qt), host, - ip, + ipStr, ) }