zones: introduce (private) logger interface

Signed-off-by: Alejandro Mery <amery@jpi.io>

pkg/zones/log.go

@@ -25,15 +25,15 @@ func (z *Zones) withInfo() (slog.Logger, bool) {
 }
 
 func (z *Zones) debug() slog.Logger {
-	return z.log.Debug()
+	return z.logger.Debug()
 }
 
 func (z *Zones) info() slog.Logger {
-	return z.log.Info()
+	return z.logger.Info()
 }
 
 func (z *Zones) warn(err error) slog.Logger {
-	l := z.log.Warn()
+	l := z.logger.Warn()
 	if err != nil {
 		l = l.WithField(slog.ErrorFieldName, err)
 	}
@@ -41,7 +41,7 @@ func (z *Zones) warn(err error) slog.Logger {
 }
 
 func (z *Zones) error(err error) slog.Logger {
-	l := z.log.Error()
+	l := z.logger.Error()
 	if err != nil {
 		l = l.WithField(slog.ErrorFieldName, err)
 	}

pkg/zones/machine.go

@@ -10,8 +10,6 @@ import (
 // A Machine is a machine on a Zone
 type Machine struct {
 	zone *Zone
-	logger
-
 	ID   int    `toml:"id"`
 	Name string `toml:"-" json:"-" yaml:"-"`
 

pkg/zones/options.go

@@ -69,7 +69,7 @@ func WithLogger(log slog.Logger) ScanOption {
 		}
 
 		opt.Logger = log
-		m.log = log
+		m.logger = log
 		return nil
 	}
 }

pkg/zones/scan.go

@@ -32,9 +32,8 @@ func (m *Zones) scanDirectory(_ *ScanOptions) error {
 	for _, e := range entries {
 		if e.IsDir() {
 			z := &Zone{
-				zones:  m,
+				zones: m,
-				logger: m,
+				Name:  e.Name(),
-				Name:   e.Name(),
 			}
 
 			if err := z.scan(); err != nil {
@@ -133,9 +132,8 @@ func (z *Zone) scan() error {
 	for _, e := range entries {
 		if e.IsDir() {
 			m := &Machine{
-				zone:   z,
+				zone: z,
-				logger: z,
+				Name: e.Name(),
-				Name:   e.Name(),
 			}
 
 			if err := m.init(); err != nil {

pkg/zones/zones.go

@@ -88,7 +88,6 @@ func FilterMachines(m MachineIterator, cond func(*Machine) bool) (Machines, int)
 // Zone represents one zone in a cluster
 type Zone struct {
 	zones *Zones
-	logger
 
 	ID   int    `toml:"id"`
 	Name string `toml:"name"`
@@ -143,7 +142,7 @@ func (z *Zone) GatewayIDs() ([]int, int) {
 // Zones represents all zones in a cluster
 type Zones struct {
 	dir      fs.FS
-	log      slog.Logger
+	logger   slog.Logger
 	resolver resolver.Resolver
 	domain   string