Merge pull request #14 from anchore/feat/remove-dev-logging

feat: log timestamps as iso, remove dev logging
anchore · Jan 5, 2023 · 370ce0e · 370ce0e
2 parents 18870a3 + ac19518
commit 370ce0e
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 25 deletions.
diff --git a/cmd/cmd.go b/cmd/cmd.go
@@ -54,7 +54,6 @@ func initLogging() {
 	logConfig := logger.LogConfig{
 		Level:        appConfig.Log.Level,
 		FileLocation: appConfig.Log.FileLocation,
-		Dev:          appConfig.Dev.Log,
 	}
 
 	logger.InitLogger(logConfig)

diff --git a/internal/config/config.go b/internal/config/config.go
@@ -82,7 +82,6 @@ type Logging struct {
 // Development Configuration (only profile-cpu at the moment)
 type Development struct {
 	ProfileCPU bool `mapstructure:"profile-cpu"`
-	Log        bool `mapstructure:"log"`
 }
 
 // Return whether or not AnchoreDetails are specified

diff --git a/internal/logger/logger.go b/internal/logger/logger.go
@@ -32,7 +32,6 @@ func (log Logger) Error(msg string, err error, args ...interface{}) {
 type LogConfig struct {
 	Level        string
 	FileLocation string
-	Dev          bool
 }
 
 var Log Logger
@@ -47,31 +46,24 @@ func InitLogger(logConfig LogConfig) {
 		level = zap.NewAtomicLevelAt(zapcore.InfoLevel)
 	}
 
-	if logConfig.Dev {
+	if logConfig.FileLocation != "" {
+		cfg = zap.Config{
+			Level:         level,
+			Encoding:      "json",
+			EncoderConfig: zap.NewProductionEncoderConfig(),
+			OutputPaths:   []string{logConfig.FileLocation},
+		}
+	} else {
+		zapEncoderCfg := zap.NewProductionEncoderConfig()
+		zapEncoderCfg.EncodeTime = zapcore.ISO8601TimeEncoder
+
 		cfg = zap.Config{
 			Level:            level,
 			Encoding:         "console",
-			EncoderConfig:    zap.NewDevelopmentEncoderConfig(),
+			EncoderConfig:    zapEncoderCfg,
 			OutputPaths:      []string{"stdout"},
 			ErrorOutputPaths: []string{"stderr"},
 		}
-	} else {
-		if logConfig.FileLocation != "" {
-			cfg = zap.Config{
-				Level:         level,
-				Encoding:      "json",
-				EncoderConfig: zap.NewProductionEncoderConfig(),
-				OutputPaths:   []string{logConfig.FileLocation},
-			}
-		} else {
-			cfg = zap.Config{
-				Level:            level,
-				Encoding:         "console",
-				EncoderConfig:    zap.NewProductionEncoderConfig(),
-				OutputPaths:      []string{"stdout"},
-				ErrorOutputPaths: []string{"stderr"},
-			}
-		}
 	}
 
 	Log = Logger{

diff --git a/internal/logger/logger_test.go b/internal/logger/logger_test.go
@@ -11,7 +11,7 @@ import (
 func TestLoggerInit(t *testing.T) {
 	assert.Nil(t, Log.zap)
 
-	InitLogger(LogConfig{Level: "info", FileLocation: "", Dev: false})
+	InitLogger(LogConfig{Level: "info", FileLocation: ""})
 
 	assert.NotNil(t, Log.zap)
 }
@@ -20,7 +20,7 @@ func TestLogsToFileIfFileLocationProvided(t *testing.T) {
 	tmpDir := t.TempDir()
 	fileLocation := path.Join(tmpDir, "log")
 
-	InitLogger(LogConfig{Level: "info", FileLocation: fileLocation, Dev: false})
+	InitLogger(LogConfig{Level: "info", FileLocation: fileLocation})
 
 	var expectedLogMsg = "test log foobar"
 	Log.Info(expectedLogMsg)
@@ -35,7 +35,7 @@ func TestLogsToFileIfFileLocationProvided(t *testing.T) {
 }
 
 func TestLoggerDefaultsToInfoLevelOnInvalidLevel(t *testing.T) {
-	InitLogger(LogConfig{Level: "invalid", FileLocation: "", Dev: false})
+	InitLogger(LogConfig{Level: "invalid", FileLocation: ""})
 
 	assert.Equal(t, Log.zap.Level().String(), "info")
 }