Enforce mode & level for debug logger, cleanup test logging init

pkg/logger/logger.go

@@ -15,14 +15,14 @@ var (
 )
 
 func Default() *zap.Logger {
+	if defaultLogger == nil {
+		return zap.NewNop()
+	}
+
 	return defaultLogger
 }
 
 func SetDefault(logger *zap.Logger) {
-	if logger == nil {
-		logger = zap.NewNop()
-	}
-
 	defaultLogger = logger
 }
 
@@ -50,8 +50,12 @@ func Init() {
 }
 
 func MakeDebugLogger() *zap.Logger {
+	dbgOpt := *opt
+	dbgOpt.Debug = true
+	dbgOpt.Level = "debug"
+
 	var (
-		conf = applyOptions(zap.NewDevelopmentConfig(), opt)
+		conf = applyOptions(zap.NewDevelopmentConfig(), &dbgOpt)
 	)
 
 	// Print log level in colors
@@ -67,7 +71,7 @@ func MakeDebugLogger() *zap.Logger {
 		panic(err)
 	}
 
-	return applySpecials(logger, opt)
+	return applySpecials(logger, &dbgOpt)
 }
 
 // Applies options from environment variables

tests/compose/main_test.go

@@ -60,7 +60,7 @@ func rs(a ...int) string {
 
 func InitTestApp() {
 	if testApp == nil {
-		ctx := logger.ContextWithValue(cli.Context(), logger.MakeDebugLogger())
+		ctx := cli.Context()
 
 		testApp = helpers.NewIntegrationTestApp(ctx, func(app *app.CortezaApp) (err error) {
 			service.DefaultStore = app.Store

tests/federation/main_test.go

@@ -46,7 +46,7 @@ func init() {
 
 func InitTestApp() {
 	if testApp == nil {
-		ctx := logger.ContextWithValue(cli.Context(), logger.MakeDebugLogger())
+		ctx := cli.Context()
 
 		testApp = helpers.NewIntegrationTestApp(ctx, func(app *app.CortezaApp) (err error) {
 			app.Opt.Federation.Enabled = true

tests/helpers/app.go

@@ -14,7 +14,8 @@ import (
 )
 
 func NewIntegrationTestApp(ctx context.Context, initTestServices func(*app.CortezaApp) error) *app.CortezaApp {
-	logger.Init()
+	// Enforce debug logger for tests
+	logger.SetDefault(logger.MakeDebugLogger())
 
 	var (
 		a = app.New()

tests/reporter/main_test.go

@@ -82,7 +82,7 @@ func rs(a ...int) string {
 
 func InitTestApp() {
 	if testApp == nil {
-		ctx := logger.ContextWithValue(cli.Context(), logger.MakeDebugLogger())
+		ctx := cli.Context()
 
 		testApp = helpers.NewIntegrationTestApp(ctx, func(app *app.CortezaApp) (err error) {
 			service.DefaultStore = app.Store

tests/workflows/main_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/cortezaproject/corteza-server/pkg/eventbus"
 	"github.com/cortezaproject/corteza-server/pkg/expr"
 	"github.com/cortezaproject/corteza-server/pkg/id"
+	"github.com/cortezaproject/corteza-server/pkg/logger"
 	"github.com/cortezaproject/corteza-server/store"
 	sysTypes "github.com/cortezaproject/corteza-server/system/types"
 	"github.com/cortezaproject/corteza-server/tests/helpers"
@@ -36,6 +37,7 @@ func init() {
 }
 
 func TestMain(m *testing.M) {
+	logger.SetDefault(logger.MakeDebugLogger())
 	ctx := context.Background()
 
 	defApp = helpers.NewIntegrationTestApp(ctx, func(app *app.CortezaApp) (err error) {