From 379794ceddddf01c1c8ddd822cbefe97a323d6ec Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Thu, 7 Sep 2023 13:55:32 +0000 Subject: [PATCH] zones: introduce (private) logger interface Signed-off-by: Alejandro Mery --- go.mod | 1 + go.sum | 2 ++ pkg/zones/log.go | 49 ++++++++++++++++++++++++++++++++++++++++++++ pkg/zones/options.go | 1 + pkg/zones/zones.go | 2 ++ 5 files changed, 55 insertions(+) create mode 100644 pkg/zones/log.go diff --git a/go.mod b/go.mod index 019ccee..31f8fb3 100644 --- a/go.mod +++ b/go.mod @@ -8,6 +8,7 @@ require ( darvaza.org/resolver v0.5.4 darvaza.org/sidecar v0.0.2 darvaza.org/slog v0.5.3 + darvaza.org/slog/handlers/discard v0.4.5 github.com/burntSushi/toml v0.3.1 github.com/gofrs/uuid/v5 v5.0.0 github.com/hack-pad/hackpadfs v0.2.1 diff --git a/go.sum b/go.sum index e2f357a..0d816c7 100644 --- a/go.sum +++ b/go.sum @@ -10,6 +10,8 @@ darvaza.org/sidecar v0.0.2 h1:4H8FUxc43kkLjxdShN1CoxLTcoHQsZjDVwm7kt6eIK0= darvaza.org/sidecar v0.0.2/go.mod h1:yFC3Qt3j+uS7n9CMpLxwrA68z+FNJhENoenBc9zBJJo= darvaza.org/slog v0.5.3 h1:sQzmZXgqRh9oFMKBwEYrEpucLvKJVZxaxa2bHIA6GJ0= darvaza.org/slog v0.5.3/go.mod h1:59d+yi+C7gn4pDDuwbbOKawERpdXthFFk1Yc+Sv6XB0= +darvaza.org/slog/handlers/discard v0.4.5 h1:RRykOItNolHyiUav57lG/GFBL33rcljoa0nWTpY+T0g= +darvaza.org/slog/handlers/discard v0.4.5/go.mod h1:HYHfISQjMqcPbPoPZ92ib/u7s9JcXvF6OaygpPFwdF8= darvaza.org/slog/handlers/filter v0.4.5 h1:CX1bMzldd67e3y3s3Sh4jK8Lyo0WMvTGBB2lD315jhc= darvaza.org/slog/handlers/filter v0.4.5/go.mod h1:OuH9rHYg9CIErTJCZliMnFexBfP/HJ9PZ1V1VwSCZ1g= darvaza.org/slog/handlers/zerolog v0.4.5 h1:W4cgGORx4wImr+RL96CWSQGTdkZzKX6YHXPSYJvdoB4= diff --git a/pkg/zones/log.go b/pkg/zones/log.go new file mode 100644 index 0000000..ceaf5ee --- /dev/null +++ b/pkg/zones/log.go @@ -0,0 +1,49 @@ +package zones + +import "darvaza.org/slog" + +type logger interface { + withDebug() (slog.Logger, bool) + withInfo() (slog.Logger, bool) + + debug() slog.Logger + info() slog.Logger + warn(error) slog.Logger + error(error) slog.Logger +} + +var ( + _ logger = (*Zones)(nil) +) + +func (z *Zones) withDebug() (slog.Logger, bool) { + return z.debug().WithEnabled() +} + +func (z *Zones) withInfo() (slog.Logger, bool) { + return z.debug().WithEnabled() +} + +func (z *Zones) debug() slog.Logger { + return z.log.Debug() +} + +func (z *Zones) info() slog.Logger { + return z.log.Info() +} + +func (z *Zones) warn(err error) slog.Logger { + l := z.log.Warn() + if err != nil { + l = l.WithField(slog.ErrorFieldName, err) + } + return l +} + +func (z *Zones) error(err error) slog.Logger { + l := z.log.Error() + if err != nil { + l = l.WithField(slog.ErrorFieldName, err) + } + return l +} diff --git a/pkg/zones/options.go b/pkg/zones/options.go index 76a69bd..1e7eb77 100644 --- a/pkg/zones/options.go +++ b/pkg/zones/options.go @@ -69,6 +69,7 @@ func WithLogger(log slog.Logger) ScanOption { } opt.Logger = log + m.log = log return nil } } diff --git a/pkg/zones/zones.go b/pkg/zones/zones.go index fad4c30..89d2509 100644 --- a/pkg/zones/zones.go +++ b/pkg/zones/zones.go @@ -6,6 +6,7 @@ import ( "sort" "darvaza.org/resolver" + "darvaza.org/slog" "github.com/gofrs/uuid/v5" ) @@ -141,6 +142,7 @@ func (z *Zone) GatewayIDs() ([]int, int) { // Zones represents all zones in a cluster type Zones struct { dir fs.FS + log slog.Logger resolver resolver.Resolver domain string