moved logger config to its own package and made logs work while in tests

Author: Southclaws

executor/cmd_test.go

@@ -10,6 +10,8 @@ import (
 	"github.com/picostack/pico/executor"
 	"github.com/picostack/pico/secret/memory"
 	"github.com/picostack/pico/task"
+
+	_ "github.com/picostack/pico/logger"
 )
 
 func TestMain(m *testing.M) {

logger/logger.go

@@ -0,0 +1,39 @@
+package logger
+
+import (
+	"os"
+	"strconv"
+	"strings"
+
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+)
+
+func init() {
+	// constructs a logger and replaces the default global logger
+	var config zap.Config
+	if d, e := strconv.ParseBool(os.Getenv("DEVELOPMENT")); d && e == nil || isInTests() {
+		config = zap.NewDevelopmentConfig()
+	} else {
+		config = zap.NewProductionConfig()
+	}
+	config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
+	config.DisableStacktrace = true
+	if d, e := strconv.ParseBool(os.Getenv("DEBUG")); d && e == nil || isInTests() {
+		config.Level = zap.NewAtomicLevelAt(zap.DebugLevel)
+	}
+	logger, err := config.Build()
+	if err != nil {
+		panic(err)
+	}
+	zap.ReplaceGlobals(logger)
+}
+
+func isInTests() bool {
+	for _, arg := range os.Args {
+		if strings.HasPrefix(arg, "-test.v=") {
+			return true
+		}
+	}
+	return false
+}

main.go

@@ -4,40 +4,19 @@ import (
 	"context"
 	"os"
 	"os/signal"
-	"strconv"
 	"time"
 
 	_ "github.com/joho/godotenv/autoload"
 	"github.com/pkg/errors"
 	"github.com/urfave/cli"
 	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
 
+	_ "github.com/picostack/pico/logger"
 	"github.com/picostack/pico/service"
 )
 
 var version = "master"
 
-func init() {
-	// constructs a logger and replaces the default global logger
-	var config zap.Config
-	if d, e := strconv.ParseBool(os.Getenv("DEVELOPMENT")); d && e == nil {
-		config = zap.NewDevelopmentConfig()
-	} else {
-		config = zap.NewProductionConfig()
-	}
-	config.EncoderConfig.EncodeTime = zapcore.ISO8601TimeEncoder
-	config.DisableStacktrace = true
-	if d, e := strconv.ParseBool(os.Getenv("DEBUG")); d && e == nil {
-		config.Level = zap.NewAtomicLevelAt(zap.DebugLevel)
-	}
-	logger, err := config.Build()
-	if err != nil {
-		panic(err)
-	}
-	zap.ReplaceGlobals(logger)
-}
-
 func main() {
 	app := cli.NewApp()
 

watcher/git_test.go

@@ -6,13 +6,14 @@ import (
 	"time"
 
 	"github.com/picostack/pico/task"
+
+	_ "github.com/picostack/pico/logger"
 )
 
 var w *GitWatcher
 var bus chan task.ExecutionTask
 
 func TestMain(m *testing.M) {
-	os.Setenv("DEBUG", "1")
 	bus = make(chan task.ExecutionTask, 16)
 	w = NewGitWatcher(".test", bus, time.Second, nil)