Refactored logging configuration setup

The default logging configuration has been refactored to support both console and file logging. The logic for generating the default config has been moved from main.go to a new file, server/logging.go. This change allows the application to dynamically choose between console or file logging based on the 'EnableFileLog' flag in the configuration.

main.go

@@ -48,7 +48,7 @@ func main() {
 	cfgJSON := cfg.LoggingCfgJSON
 	if cfg.LoggingCfgFile == "" && cfgJSON == "" {
 		// if no logging defined, use default config (console output)
-		cfgJSON = defaultLoggingConfig()
+		cfgJSON = server.DefaultLoggingConfig(cfg)
 	}
 	err = logger.Configure(cfg.LoggingCfgFile, cfgJSON, nil)
 	if err != nil {
@@ -71,31 +71,3 @@ func main() {
 
 	srv.Stop()
 }
-
-func defaultLoggingConfig() string {
-	return `
-	{
-		"def": {
-			"type": "console",
-			"options": {
-				"out": "stdout"
-			},
-			"format": "plain",
-			"format_options": {
-				"delim": " ",
-				"min_level_len": 5,
-				"min_msg_len": 40,
-				"enable_color": true,
-				"enable_caller": true
-			},
-			"levels": [
-				{"id": 5, "name": "debug"},
-				{"id": 4, "name": "info", "color": 36},
-				{"id": 3, "name": "warn"},
-				{"id": 2, "name": "error", "color": 31},
-				{"id": 1, "name": "fatal", "stacktrace": true},
-				{"id": 0, "name": "panic", "stacktrace": true}
-			]
-		}
-	}`
-}

server/logging.go

@@ -0,0 +1,74 @@
+package server
+
+import (
+	"fmt"
+	"strings"
+)
+
+func DefaultLoggingConfig(cfg *ConfigPushProxy) string {
+	if cfg.EnableFileLog == false {
+		return defaultLoggingConsoleLogConfig()
+	} else {
+		return defaultLoggingFileLogConfig(cfg.LogFileLocation)
+	}
+}
+
+func defaultLoggingFileLogConfig(filename string) string {
+	return fmt.Sprintf(`
+		{
+			"def": {
+				"type": "file",
+				"options": {
+					"filename": "%s"
+				},
+				"format": "plain",
+				"format_options": {
+					"delim": " ",
+					"min_level_len": 5,
+					"min_msg_len": 40,
+					"enable_color": true,
+					"enable_caller": true
+				},
+				"levels": [
+					{"id": 5, "name": "debug"},
+					{"id": 4, "name": "info", "color": 36},
+					{"id": 3, "name": "warn"},
+					{"id": 2, "name": "error", "color": 31},
+					{"id": 1, "name": "fatal", "stacktrace": true},
+					{"id": 0, "name": "panic", "stacktrace": true}
+				]
+			}
+		}`, escapeDoubleQuotes(filename))
+}
+
+func defaultLoggingConsoleLogConfig() string {
+	return `
+		{
+			"def": {
+				"type": "console",
+				"options": {
+					"out": "stdout"
+				},
+				"format": "plain",
+				"format_options": {
+					"delim": " ",
+					"min_level_len": 5,
+					"min_msg_len": 40,
+					"enable_color": true,
+					"enable_caller": true
+				},
+				"levels": [
+					{"id": 5, "name": "debug"},
+					{"id": 4, "name": "info", "color": 36},
+					{"id": 3, "name": "warn"},
+					{"id": 2, "name": "error", "color": 31},
+					{"id": 1, "name": "fatal", "stacktrace": true},
+					{"id": 0, "name": "panic", "stacktrace": true}
+				]
+			}
+		}`
+}
+
+func escapeDoubleQuotes(input string) string {
+	return strings.ReplaceAll(input, `"`, `\"`)
+}