From 9e87b43b33966cc63a04852d68abe89210009a65 Mon Sep 17 00:00:00 2001
From: Denis Arh <denis.arh@gmail.com>
Date: Thu, 2 Sep 2021 15:14:08 +0200
Subject: [PATCH] Enforce mode & level for debug logger, cleanup test logging
 init

---
 pkg/logger/logger.go          | 16 ++++++++++------
 tests/compose/main_test.go    |  2 +-
 tests/federation/main_test.go |  2 +-
 tests/helpers/app.go          |  3 ++-
 tests/reporter/main_test.go   |  2 +-
 tests/workflows/main_test.go  |  2 ++
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkg/logger/logger.go b/pkg/logger/logger.go
index ad6deb74c..8c3b1d983 100644
--- a/pkg/logger/logger.go
+++ b/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
diff --git a/tests/compose/main_test.go b/tests/compose/main_test.go
index 0dc432359..86becd259 100644
--- a/tests/compose/main_test.go
+++ b/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
diff --git a/tests/federation/main_test.go b/tests/federation/main_test.go
index ae5866b56..ab06abc98 100644
--- a/tests/federation/main_test.go
+++ b/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
diff --git a/tests/helpers/app.go b/tests/helpers/app.go
index a826b7276..c221693e7 100644
--- a/tests/helpers/app.go
+++ b/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()
diff --git a/tests/reporter/main_test.go b/tests/reporter/main_test.go
index 82b1b4ae2..36d4778d7 100644
--- a/tests/reporter/main_test.go
+++ b/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
diff --git a/tests/workflows/main_test.go b/tests/workflows/main_test.go
index de6600e0e..9f4ed3f06 100644
--- a/tests/workflows/main_test.go
+++ b/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) {