Merge pull request #147 from deploymenttheory/dev

Refactor logger.BuildLogger function to ensure correct log path

Author: ShocOne

logger/zaplogger_config.go

@@ -17,6 +17,12 @@ func BuildLogger(logLevel LogLevel, encoding string, logConsoleSeparator string,
 		encoding = "console"
 	}
 
+	// Ensure the log path is correct and get the final log file path
+	logPath, err := EnsureLogFilePath(logExportPath)
+	if err != nil {
+		panic(err)
+	}
+
 	// Set up custom encoder configuration
 	encoderCfg := zap.NewProductionEncoderConfig()
 
@@ -69,7 +75,7 @@ func BuildLogger(logLevel LogLevel, encoding string, logConsoleSeparator string,
 
 	// Conditionally set the OutputPaths to include the log export path if provided
 	if logExportPath != "" {
-		config.OutputPaths = append(config.OutputPaths, logExportPath)
+		config.OutputPaths = append(config.OutputPaths, logPath)
 	}
 
 	// Build the logger from the configuration

logger/zaplogger_logpath.go

@@ -0,0 +1,39 @@
+// logger/zaplogger_logpath.go
+
+package logger
+
+import (
+	"os"
+	"path/filepath"
+	"time"
+)
+
+// EnsureLogFilePath checks the provided path and prepares it for use with the logger.
+// If the path is a directory, it appends a timestamp-based filename.
+// If the path includes a filename, it checks for the existence of the file.
+// If no path is provided, it defaults to creating a log file in the current directory with a timestamp-based name.
+func EnsureLogFilePath(logPath string) (string, error) {
+	if logPath == "" {
+		// Default to the current directory with a timestamp-based filename if no path is provided
+		logPath = filepath.Join(".", "log_"+time.Now().Format("20060102_150405")+".log")
+	} else {
+		info, err := os.Stat(logPath)
+
+		if os.IsNotExist(err) || (err == nil && info.IsDir()) {
+			// If the path doesn't exist or is a directory, append a timestamp-based filename
+			logPath = filepath.Join(logPath, "log_"+time.Now().Format("20060102_150405")+".log")
+		} else if err != nil {
+			// If there's an error other than "not exists", return it
+			return "", err
+		}
+		// If the path exists and is not a directory, it's assumed to be a filename and will be used as is
+	}
+
+	// Ensure the directory exists
+	dir := filepath.Dir(logPath)
+	if err := os.MkdirAll(dir, 0755); err != nil {
+		return "", err
+	}
+
+	return logPath, nil
+}