better err msgs

buglloc · Jan 19, 2024 · 872e55b · 872e55b
1 parent 60151b5
commit 872e55b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/internal/config/listener.go b/internal/config/listener.go
@@ -78,7 +78,7 @@ func (l *RFC2136Listener) Validate() error {
 func (r *Runtime) NewListener() (listener.Listener, error) {
 	u, err := r.NewUpstream()
 	if err != nil {
-		return nil, fmt.Errorf("unable to create upstream for listener: %w", err)
+		return nil, fmt.Errorf("create upstream for listener: %w", err)
 	}
 
 	switch r.cfg.Listener.Kind {

diff --git a/internal/listener/lrfc2136/listener.go b/internal/listener/lrfc2136/listener.go
@@ -259,7 +259,7 @@ func (a *Listener) handleQuery(ctx context.Context, m *dns.Msg, r *dns.Msg) erro
 			if soa.Hdr.Name != q.Name {
 				return dnserr.NewDNSError(
 					dns.RcodeServerFailure,
-					fmt.Errorf("%q is not a zone", q.Name),
+					fmt.Errorf("%q (question) is not a zone %q (header)", q.Name, soa.Hdr.Name),
 				)
 			}
 
@@ -281,7 +281,7 @@ func (a *Listener) handleQuery(ctx context.Context, m *dns.Msg, r *dns.Msg) erro
 		if len(rules) == 0 {
 			return dnserr.NewDNSError(
 				dns.RcodeNameError,
-				fmt.Errorf("no reqords for %q was found", q.Name),
+				fmt.Errorf("no records for %q was found", q.Name),
 			)
 		}
 

diff --git a/internal/upstream/uadguard/tx.go b/internal/upstream/uadguard/tx.go
@@ -53,7 +53,7 @@ func (t *Tx) Append(r upstream.Rule) error {
 
 	arpa, err := dns.ReverseAddr(r.ValueStr)
 	if err != nil {
-		return fmt.Errorf("unable to generate arpa address: %w", err)
+		return fmt.Errorf("generate arpa address: %w", err)
 	}
 
 	_ = t.rules.Delete(upstream.Rule{

diff --git a/internal/upstream/ucloudflare/client.go b/internal/upstream/ucloudflare/client.go
@@ -26,7 +26,7 @@ func NewUpstream(token string, opts ...Option) (*Upstream, error) {
 	httpc := xhttp.NewHTTPClient()
 	cfc, err := cloudflare.NewWithAPIToken(token, cloudflare.HTTPClient(httpc))
 	if err != nil {
-		return nil, fmt.Errorf("unable to create cloudflare client: %w", err)
+		return nil, fmt.Errorf("create cloudflare client: %w", err)
 	}
 
 	return NewUpstreamWithCFC(cfc, opts...)