From 4e3d5dd003d41983462142468b51e985f58378a9 Mon Sep 17 00:00:00 2001 From: Vivek Patel Date: Mon, 28 Feb 2022 17:31:29 +0530 Subject: [PATCH] Fix log reference on discovery service initialisation --- compose/service/service.go | 10 +++++----- system/service/service.go | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/compose/service/service.go b/compose/service/service.go index d91daca6e..7d5d99d50 100644 --- a/compose/service/service.go +++ b/compose/service/service.go @@ -106,14 +106,14 @@ func Initialize(ctx context.Context, log *zap.Logger, s store.Storer, c Config) DefaultActionlog = actionlog.NewService(DefaultStore, log, tee, policy) } - // Activity log for record + // Activity log for compose resources { - log := zap.NewNop() - if c.Discovery.Debug { - log = logger.MakeDebugLogger() + l := log + if !c.Discovery.Debug { + l = zap.NewNop() } - DefaultResourceActivityLog := discovery.Service(log, c.Discovery, DefaultStore, eventbus.Service()) + DefaultResourceActivityLog := discovery.Service(l, c.Discovery, DefaultStore, eventbus.Service()) err = DefaultResourceActivityLog.InitResourceActivityLog(ctx, []string{ (types.Namespace{}).LabelResourceKind(), (types.Module{}).LabelResourceKind(), diff --git a/system/service/service.go b/system/service/service.go index 84134f84d..41634feb2 100644 --- a/system/service/service.go +++ b/system/service/service.go @@ -122,14 +122,14 @@ func Initialize(ctx context.Context, log *zap.Logger, s store.Storer, ws websock DefaultActionlog = actionlog.NewService(DefaultStore, log, tee, policy) } - // Activity log for user + // Activity log for system resources { - log := zap.NewNop() - if c.Discovery.Debug { - log = logger.MakeDebugLogger() + l := log + if !c.Discovery.Debug { + l = zap.NewNop() } - DefaultResourceActivityLog := discovery.Service(log, c.Discovery, DefaultStore, eventbus.Service()) + DefaultResourceActivityLog := discovery.Service(l, c.Discovery, DefaultStore, eventbus.Service()) err = DefaultResourceActivityLog.InitResourceActivityLog(ctx, []string{ //(types.User{}).RbacResource(), // @todo user?? suppose to be system:user "system:user",