From 7255fc02c8f2a80a178e8bb547d0d4b3e3e2f6e1 Mon Sep 17 00:00:00 2001 From: Niklas Date: Wed, 24 Feb 2021 13:50:13 +0100 Subject: [PATCH] Revert "added debug messages" This reverts commit 00a82aca87548acd0a3194773b5368b401da8e95. --- internal/authoritative.go | 2 -- internal/cooldns.go | 12 ------------ internal/debug.go | 35 ----------------------------------- 3 files changed, 49 deletions(-) delete mode 100644 internal/debug.go diff --git a/internal/authoritative.go b/internal/authoritative.go index f9f84eb..cb6fcc8 100644 --- a/internal/authoritative.go +++ b/internal/authoritative.go @@ -124,7 +124,5 @@ func handleRequest(w dns.ResponseWriter, r *dns.Msg, zone zoneView) { m.SetRcode(m, dns.RcodeNameError) } - debugResponse(m) - w.WriteMsg(m) } diff --git a/internal/cooldns.go b/internal/cooldns.go index 812582f..af7d896 100644 --- a/internal/cooldns.go +++ b/internal/cooldns.go @@ -18,13 +18,6 @@ type zoneMap map[string][]zoneView // Start starts cooldns func Start(configPath string) { - - debug := os.Getenv("COOLDNS_DEBUG") - if len(debug) != 0 { - debugFlag = true - debugLog("Enabled debug") - } - config, err := loadConfig(configPath) if err != nil { log.Fatalf("Failed to load config: %s\n", err.Error()) @@ -87,8 +80,6 @@ func createServer(zones zoneMap, config config, aclList map[string]*net.IPNet, b return } - debugRequest(r, ip) - // Check if it is a ACME DNS-01 challange if config.Lego.Enable && handleACMERequest(w, r, acmeList) { return @@ -105,7 +96,6 @@ func createServer(zones zoneMap, config config, aclList map[string]*net.IPNet, b handleBlockedDomain(w, r) } else { // Forward request - debugLog("Forwarded request") in, _, err := c.Exchange(r, config.Forward.Server) if err != nil { @@ -177,8 +167,6 @@ func createHandler(zones []zoneView, config config, aclList map[string]*net.IPNe return } - debugRequest(r, ip) - // Check if it is a ACME DNS-01 challange if config.Lego.Enable && handleACMERequest(w, r, acmeList) { return diff --git a/internal/debug.go b/internal/debug.go deleted file mode 100644 index 338736d..0000000 --- a/internal/debug.go +++ /dev/null @@ -1,35 +0,0 @@ -package cooldns - -import ( - "fmt" - "log" - "net" - - "github.com/miekg/dns" -) - -var debugFlag = false - -func debugLog(msg string) { - if !debugFlag { - return - } - - log.Printf("DEBUG: %s", msg) -} - -func debugRequest(r *dns.Msg, ip net.IP) { - if !debugFlag { - return - } - - debugLog(fmt.Sprintf("Request from %s: %s", ip, r.String())) -} - -func debugResponse(m *dns.Msg) { - if !debugFlag { - return - } - - debugLog(fmt.Sprintf("Response send: %s", m.String())) -}