Skip to content

Commit

Permalink
allow using slog.Default()
Browse files Browse the repository at this point in the history
  • Loading branch information
zserge committed Apr 30, 2024
1 parent 7ff8485 commit f1abff7
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 3 deletions.
6 changes: 6 additions & 0 deletions pkg/infra/log/slogadapter/adapter.go
Expand Up @@ -13,6 +13,12 @@ type slogHandler struct {
log.Logger
}

func init() {
// Lots of New's here: Default = slog.Logger <- slog.Handler <- infra/log.Logger
slog.SetDefault(slog.New(New(log.New())))
}

// Provide is a helper method to be used with Wire, however most services should use slog.Default()
func Provide() slog.Handler { return New(log.New()) }

// NewSLogHandler returns a new slog.Handler that logs to the given log.Logger.
Expand Down
3 changes: 1 addition & 2 deletions pkg/services/folder/folderimpl/folder.go
Expand Up @@ -59,11 +59,10 @@ func ProvideService(
features featuremgmt.FeatureToggles,
supportBundles supportbundles.Service,
r prometheus.Registerer,
slogHandler slog.Handler,
) folder.Service {
store := ProvideStore(db)
srv := &Service{
log: slog.New(slogHandler).With("logger", "folder-service"),
log: slog.Default().With("logger", "folder-service"),
dashboardStore: dashboardStore,
dashboardFolderStore: folderStore,
store: store,
Expand Down
2 changes: 1 addition & 1 deletion pkg/services/folder/folderimpl/folder_test.go
Expand Up @@ -60,7 +60,7 @@ func TestIntegrationProvideFolderService(t *testing.T) {
t.Run("should register scope resolvers", func(t *testing.T) {
ac := acmock.New()
db := db.InitTestDB(t)
ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), nil, nil, db, featuremgmt.WithFeatures(), supportbundlestest.NewFakeBundleService(), nil, logtest.NewTestHandler(t))
ProvideService(ac, bus.ProvideBus(tracing.InitializeTracerForTest()), nil, nil, db, featuremgmt.WithFeatures(), supportbundlestest.NewFakeBundleService(), nil)

require.Len(t, ac.Calls.RegisterAttributeScopeResolver, 3)
})
Expand Down

0 comments on commit f1abff7

Please sign in to comment.