change: no dialer warning logger anymore

- parent dialer caller can log the error - remove warner settings field for dot and plain dialers
qdm12 · Nov 3, 2024 · 277e4bf · 277e4bf
1 parent 771471b
commit 277e4bf
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 17 deletions.
diff --git a/internal/setup/dot.go b/internal/setup/dot.go
@@ -32,7 +32,6 @@ func dotServer(userSettings config.Settings, ipv6Support bool,
 	dialerSettings := dot.Settings{
 		UpstreamResolvers: upstreamResolvers,
 		IPVersion:         ipVersion,
-		Warner:            logger,
 		Metrics:           metrics,
 	}
 	dialer, err := dot.New(dialerSettings)

diff --git a/pkg/dot/dialer.go b/pkg/dot/dialer.go
@@ -15,7 +15,6 @@ type Dialer struct {
 	servers   []provider.DoTServer
 	ipv6      bool
 	netDialer *net.Dialer
-	warner    Warner
 	metrics   Metrics
 }
 
@@ -38,7 +37,6 @@ func New(settings Settings) (dial *Dialer, err error) {
 		netDialer: &net.Dialer{
 			Timeout: settings.Timeout,
 		},
-		warner:  settings.Warner,
 		metrics: settings.Metrics,
 	}, nil
 }
@@ -55,7 +53,6 @@ func (d *Dialer) Dial(ctx context.Context, _, _ string) (
 
 	conn, err = d.netDialer.DialContext(ctx, "tcp", serverAddress)
 	if err != nil {
-		d.warner.Warn(err.Error())
 		d.metrics.DoTDialInc(serverName, serverAddress, "error")
 		return nil, err
 	}

diff --git a/pkg/dot/settings.go b/pkg/dot/settings.go
@@ -6,7 +6,6 @@ import (
 	"time"
 
 	metricsnoop "github.com/qdm12/dns/v2/pkg/dot/metrics/noop"
-	lognoop "github.com/qdm12/dns/v2/pkg/log/noop"
 	"github.com/qdm12/dns/v2/pkg/provider"
 	"github.com/qdm12/gosettings"
 	"github.com/qdm12/gosettings/validate"
@@ -27,9 +26,6 @@ type Settings struct {
 	// upstream DNS over TLS servers. If left unset, it defaults to
 	// "ipv4".
 	IPVersion string
-	// Warner is the warning logger to log dial errors.
-	// It defaults to a No-Op warner implementation.
-	Warner Warner
 	// Metrics is the metrics interface to record metric data.
 	// It defaults to a No-Op metrics implementation.
 	Metrics Metrics
@@ -41,7 +37,6 @@ func (s *Settings) SetDefaults() {
 	const defaultTimeout = 5 * time.Second
 	s.Timeout = gosettings.DefaultComparable(s.Timeout, defaultTimeout)
 	s.IPVersion = gosettings.DefaultComparable(s.IPVersion, "ipv4")
-	s.Warner = gosettings.DefaultComparable[Warner](s.Warner, lognoop.New())
 	s.Metrics = gosettings.DefaultComparable[Metrics](s.Metrics, metricsnoop.New())
 }
 

diff --git a/pkg/plain/dialer.go b/pkg/plain/dialer.go
@@ -14,7 +14,6 @@ type Dialer struct {
 	servers   []provider.PlainServer
 	ipv6      bool
 	netDialer *net.Dialer
-	warner    Warner
 	metrics   Metrics
 }
 
@@ -37,7 +36,6 @@ func New(settings Settings) (dial *Dialer, err error) {
 		netDialer: &net.Dialer{
 			Timeout: settings.Timeout,
 		},
-		warner:  settings.Warner,
 		metrics: settings.Metrics,
 	}, nil
 }
@@ -53,7 +51,6 @@ func (d *Dialer) Dial(ctx context.Context, network, _ string) (
 
 	udpConn, err := d.netDialer.DialContext(ctx, network, serverAddress)
 	if err != nil {
-		d.warner.Warn(err.Error())
 		d.metrics.PlainDialInc(serverAddress, "error")
 		return nil, err
 	}

diff --git a/pkg/plain/settings.go b/pkg/plain/settings.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 	"time"
 
-	lognoop "github.com/qdm12/dns/v2/pkg/log/noop"
 	metricsnoop "github.com/qdm12/dns/v2/pkg/plain/metrics/noop"
 	"github.com/qdm12/dns/v2/pkg/provider"
 	"github.com/qdm12/gosettings"
@@ -27,9 +26,6 @@ type Settings struct {
 	// upstream DNS servers. If left unset, it defaults to
 	// "ipv4".
 	IPVersion string
-	// Warner is the warning logger to log dial errors.
-	// It defaults to a No-Op warner implementation.
-	Warner Warner
 	// Metrics is the metrics interface to record metric data.
 	// It defaults to a No-Op metrics implementation.
 	Metrics Metrics
@@ -41,7 +37,6 @@ func (s *Settings) SetDefaults() {
 	const defaultTimeout = 5 * time.Second
 	s.Timeout = gosettings.DefaultComparable(s.Timeout, defaultTimeout)
 	s.IPVersion = gosettings.DefaultComparable(s.IPVersion, "ipv4")
-	s.Warner = gosettings.DefaultComparable[Warner](s.Warner, lognoop.New())
 	s.Metrics = gosettings.DefaultComparable[Metrics](s.Metrics, metricsnoop.New())
 }