From 6a569cc10229509e634f328c82bca91a4b48308e Mon Sep 17 00:00:00 2001 From: "Gustavo L de Mello (Guz)" Date: Thu, 23 Jan 2025 17:18:33 -0300 Subject: [PATCH] feat(blogo,plugins,multisourcer): logging and assertions to follow the code style --- blogo/plugins/multisourcer.go | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/blogo/plugins/multisourcer.go b/blogo/plugins/multisourcer.go index 456a420..276d9c6 100644 --- a/blogo/plugins/multisourcer.go +++ b/blogo/plugins/multisourcer.go @@ -24,6 +24,7 @@ import ( "forge.capytal.company/loreddev/x/blogo/metadata" "forge.capytal.company/loreddev/x/blogo/plugin" + "forge.capytal.company/loreddev/x/tinyssert" ) const multiSourcerName = "blogo-multisourcer-sourcer" @@ -34,10 +35,12 @@ func NewMultiSourcer(opts ...MultiSourcerOpts) MultiSourcer { opt = opts[0] } + if opt.Assertions == nil { + opt.Assertions = tinyssert.NewDisabledAssertions() + } if opt.Logger == nil { opt.Logger = slog.New(slog.NewTextHandler(io.Discard, &slog.HandlerOptions{})) } - opt.Logger = opt.Logger.WithGroup(multiSourcerName) return &multiSourcer{ plugins: []plugin.Sourcer{}, @@ -77,6 +80,10 @@ func (s *multiSourcer) Name() string { } func (s *multiSourcer) Use(p plugin.Plugin) { + s.assert.NotNil(p) + s.assert.NotNil(s.plugins) + s.assert.NotNil(s.log) + log := s.log.With(slog.String("plugin", p.Name())) if plg, ok := p.(plugin.Sourcer); ok { @@ -91,6 +98,9 @@ func (s *multiSourcer) Use(p plugin.Plugin) { } func (s *multiSourcer) Source() (fs.FS, error) { + s.assert.NotNil(s.plugins) + s.assert.NotNil(s.log) + log := s.log.With() fileSystems := []fs.FS{}