Merge pull request #130 from ginger51011/feat/add-console-time-format

Add logger.console_time_format option

internal/config/config.go

@@ -133,11 +133,12 @@ func loadCustomConfig(path string) {
 func processOpts() {
 	// string options and their exported variables
 	stringOpt := map[string]*string{
-		"http.bind_addr":        &HTTPBind,
-		"http.bind_port":        &HTTPPort,
-		"http.real_ip_header":   &HeaderName,
-		"logger.directory":      &logDir,
-		"deception.server_name": &FakeServerName,
+		"http.bind_addr":             &HTTPBind,
+		"http.bind_port":             &HTTPPort,
+		"http.real_ip_header":        &HeaderName,
+		"logger.directory":           &logDir,
+		"logger.console_time_format": &ConsoleTimeFormat,
+		"deception.server_name":      &FakeServerName,
 	}
 	// string slice options and their exported variables
 	strSliceOpt := map[string]*[]string{

internal/config/defaults.go

@@ -6,6 +6,7 @@ import (
 	"os"
 	"path"
 	"runtime"
+	"time"
 
 	"github.com/spf13/afero"
 )
@@ -29,11 +30,12 @@ var (
 
 var defOpts = map[string]map[string]interface{}{
 	"logger": {
-		"debug":             true,
-		"trace":             false,
-		"nocolor":           defNoColor,
-		"use_date_filename": true,
-		"docker_logging":    false,
+		"debug":               true,
+		"trace":               false,
+		"nocolor":             defNoColor,
+		"use_date_filename":   true,
+		"docker_logging":      false,
+		"console_time_format": time.Kitchen,
 	},
 	"http": {
 		"use_unix_socket":         false,

internal/config/globals.go

@@ -1,6 +1,8 @@
 package config
 
-import "runtime/debug"
+import (
+	"runtime/debug"
+)
 
 // Title is the name of the application used throughout the configuration process.
 const Title = "HellPot"
@@ -39,6 +41,8 @@ var (
 	// CatchAll when true will cause HellPot to respond to all paths.
 	// Note that this will override MakeRobots.
 	CatchAll bool
+	// ConsoleTimeFormat sets the time format for the console. The string is passed to time.Format() down the line.
+	ConsoleTimeFormat string
 )
 
 // "http"

internal/config/logger.go

@@ -55,7 +55,7 @@ func StartLogger(pretty bool, targets ...io.Writer) zerolog.Logger {
 	var logWriter = logFile
 
 	if pretty {
-		logWriter = zerolog.MultiLevelWriter(zerolog.ConsoleWriter{NoColor: NoColor, Out: os.Stdout}, logFile)
+		logWriter = zerolog.MultiLevelWriter(zerolog.ConsoleWriter{TimeFormat: ConsoleTimeFormat, NoColor: NoColor, Out: os.Stdout}, logFile)
 	}
 
 	logger = zerolog.New(logWriter).With().Timestamp().Logger()