zones: add logger to Zone and Machine

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.logger.Debug()
+	return z.log.Debug()
 }
 
 func (z *Zones) info() slog.Logger {
-	return z.logger.Info()
+	return z.log.Info()
 }
 
 func (z *Zones) warn(err error) slog.Logger {
-	l := z.logger.Warn()
+	l := z.log.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.logger.Error()
+	l := z.log.Error()
 	if err != nil {
 		l = l.WithField(slog.ErrorFieldName, err)
 	}

pkg/zones/machine.go

@@ -10,6 +10,8 @@ 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.logger = log
+		m.log = log
 		return nil
 	}
 }

pkg/zones/scan.go

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

pkg/zones/zones.go

@@ -88,6 +88,7 @@ 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"`
@@ -142,7 +143,7 @@ func (z *Zone) GatewayIDs() ([]int, int) {
 // Zones represents all zones in a cluster
 type Zones struct {
 	dir      fs.FS
-	logger   slog.Logger
+	log      slog.Logger
 	resolver resolver.Resolver
 	domain   string