diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/file.go | 2 | ||||
| -rw-r--r-- | source/source.go | 10 | ||||
| -rw-r--r-- | source/static.go | 1 | ||||
| -rw-r--r-- | source/url.go | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/source/file.go b/source/file.go index 4ef0e7c..004868f 100644 --- a/source/file.go +++ b/source/file.go @@ -20,8 +20,6 @@ type fileSource struct { var _ Source = (*fileSource)(nil) func newFile(log *slog.Logger, cfg Config) (*fileSource, error) { - log = log.With(slog.String("source", "file")) - if _, err := os.Stat(cfg.Path); errors.Is(err, os.ErrNotExist) { return nil, fmt.Errorf("cannot access file for source: %w", err) } diff --git a/source/source.go b/source/source.go index 6fe139c..ffa380a 100644 --- a/source/source.go +++ b/source/source.go @@ -40,7 +40,15 @@ type Source interface { Lookup(Family) (netip.Addr, error) } -func New(log *slog.Logger, cfg Config) (Source, error) { +func New(log *slog.Logger, name string, cfg Config) (Source, error) { + log = log.With( + slog.Group( + "source", + slog.String("name", name), + slog.String("kind", string(cfg.Kind)), + ), + ) + if cfg.Family != IPv4 && cfg.Family != IPv6 { return nil, fmt.Errorf("%s source needs family set to ipv4 or ipv6", cfg.Kind) } diff --git a/source/static.go b/source/static.go index d2645d6..4b27e5a 100644 --- a/source/static.go +++ b/source/static.go @@ -17,7 +17,6 @@ type staticSource struct { var _ Source = (*staticSource)(nil) func newStatic(log *slog.Logger, cfg Config) (*staticSource, error) { - log = log.With("source", "static") addr, err := parse(cfg.Value, cfg.Family) if err != nil { log.Error( diff --git a/source/url.go b/source/url.go index 067d48b..41452be 100644 --- a/source/url.go +++ b/source/url.go @@ -21,8 +21,6 @@ type urlSource struct { var _ Source = (*urlSource)(nil) func newURL(log *slog.Logger, cfg Config) (*urlSource, error) { - log = log.With("source", "url") - url, err := nurl.ParseRequestURI(cfg.URL) if err != nil { return nil, fmt.Errorf("invalid url for source: %w", err) |
