Log router type during setup

nextdns · Oct 7, 2023 · ab5fc69 · ab5fc69
1 parent f1eb217
commit ab5fc69
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 5 deletions.
diff --git a/router/ddwrt/setup.go b/router/ddwrt/setup.go
@@ -28,6 +28,10 @@ func New() (*Router, bool) {
 	}, true
 }
 
+func (r *Router) String() string {
+	return "ddwrt"
+}
+
 func (r *Router) Configure(c *config.Config) error {
 	c.Listens = []string{"127.0.0.1:" + r.ListenPort}
 	r.ClientReporting = c.ReportClientInfo

diff --git a/router/detect_other.go b/router/detect_other.go
@@ -1,3 +1,4 @@
+//go:build !linux
 // +build !linux
 
 package router

diff --git a/router/edgeos/setup.go b/router/edgeos/setup.go
@@ -28,6 +28,10 @@ func New() (*Router, bool) {
 	}, true
 }
 
+func (r *Router) String() string {
+	return "edgeos"
+}
+
 func (r *Router) Configure(c *config.Config) error {
 	c.Listens = []string{"127.0.0.1:" + r.ListenPort}
 	r.ClientReporting = c.ReportClientInfo

diff --git a/router/generic/setup.go b/router/generic/setup.go
@@ -11,6 +11,10 @@ func New() *Router {
 	return &Router{}
 }
 
+func (r *Router) String() string {
+	return "generic"
+}
+
 func (r *Router) Configure(c *config.Config) error {
 	c.Listens = []string{":53"}
 	return nil

diff --git a/router/merlin/setup.go b/router/merlin/setup.go
@@ -35,6 +35,10 @@ func New() (*Router, bool) {
 	}, true
 }
 
+func (r *Router) String() string {
+	return "merlin"
+}
+
 func (r *Router) Configure(c *config.Config) error {
 	c.Listens = []string{"127.0.0.1:" + r.ListenPort}
 	r.ClientReporting = c.ReportClientInfo

diff --git a/router/openwrt/setup.go b/router/openwrt/setup.go
@@ -31,6 +31,10 @@ func New() (*Router, bool) {
 	}, true
 }
 
+func (r *Router) String() string {
+	return "openwrt"
+}
+
 func (r *Router) Configure(c *config.Config) error {
 	c.Listens = []string{"127.0.0.1:" + r.ListenPort}
 	r.ClientReporting = c.ReportClientInfo

diff --git a/router/router.go b/router/router.go
@@ -2,11 +2,14 @@ package router
 
 import (
 	"errors"
+	"fmt"
 
 	"github.com/nextdns/nextdns/config"
 )
 
 type Router interface {
+	fmt.Stringer
+
 	// Configure reads and changes c to match router's needs.
 	// Ran before listen.
 	Configure(c *config.Config) error

diff --git a/router/synology/setup.go b/router/synology/setup.go
@@ -31,6 +31,10 @@ func New() (*Router, bool) {
 	}, true
 }
 
+func (r *Router) String() string {
+	return "synology"
+}
+
 func (r *Router) Configure(c *config.Config) error {
 	if b, err := os.ReadFile("/etc/dhcpd/dhcpd.info"); err != nil || !bytes.HasPrefix(b, []byte(`enable="yes"`)) {
 		// DHCP is disabled, listen on 53 directly

diff --git a/router/ubios/setup.go b/router/ubios/setup.go
@@ -27,6 +27,10 @@ func New() (*Router, bool) {
 	}, true
 }
 
+func (r *Router) String() string {
+	return "ubios"
+}
+
 func (r *Router) Configure(c *config.Config) error {
 	if dnsFilterEnabled() {
 		return fmt.Errorf(`UDM "Content Filtering" feature is enabled. Please disable it to use NextDNS.`)

diff --git a/run.go b/run.go
@@ -181,18 +181,18 @@ func run(args []string) error {
 	if c.SetupRouter {
 		r := router.New()
 		if err := r.Configure(&c); err != nil {
-			log.Errorf("Configuring router: %v", err)
+			log.Errorf("Configuring %s router: %v", r, err)
 		}
 		p.OnStarted = append(p.OnStarted, func() {
-			log.Info("Setting up router")
+			log.Infof("Setting up %s router", r)
 			if err := r.Setup(); err != nil {
-				log.Errorf("Setting up router: %v", err)
+				log.Errorf("Setting up %s router: %v", r, err)
 			}
 		})
 		p.OnStopped = append(p.OnStopped, func() {
-			log.Info("Restore router settings")
+			log.Infof("Restore %s router settings", r)
 			if err := r.Restore(); err != nil {
-				log.Errorf("Restore router settings: %v", err)
+				log.Errorf("Restore %s router settings: %v", r, err)
 			}
 		})
 	}