From bde229321f1367f729162a466186a28d90a19b9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=8B=E5=B9=BF?= <chengg@dacentsoft.com>
Date: Wed, 29 Nov 2023 10:16:56 +0800
Subject: [PATCH] refactor

---
 console.go  | 22 ++++++----------------
 file.go     | 12 ++----------
 format.go   | 23 +++++++++++++++++++++++
 log/fat.log |  9 +++++++++
 main.go     |  1 +
 5 files changed, 41 insertions(+), 26 deletions(-)
 create mode 100644 format.go
 create mode 100644 log/fat.log

diff --git a/console.go b/console.go
index 5663df2..e5bfb65 100644
--- a/console.go
+++ b/console.go
@@ -2,15 +2,14 @@ package gologger
 
 import (
 	"fmt"
-	"strings"
 )
 
 const (
-	ErrorTemplate = "\033[1;31m%s\033[0m\n"
-	WarnTemplate  = "\033[1;33m%s\033[0m\n"
-	InfoTemplate  = "\033[1;32m%s\033[0m\n"
-	DebugTemplate = "\033[1;34m%s\033[0m\n"
-	TraceTemplate = "\033[1;35m%s\033[0m\n"
+	ErrorTemplate = "\033[1;31m%s\033[0m"
+	WarnTemplate  = "\033[1;33m%s\033[0m"
+	InfoTemplate  = "\033[1;32m%s\033[0m"
+	DebugTemplate = "\033[1;34m%s\033[0m"
+	TraceTemplate = "\033[1;35m%s\033[0m"
 )
 
 type ConsoleAppender struct {
@@ -21,17 +20,8 @@ func (c *ConsoleAppender) GetName() string {
 }
 
 func (c *ConsoleAppender) Append(logEvent LogEvent) {
-	data := []interface{}{
-		logEvent.Ts.Format("2006-01-02 15:04:05"),
-		" ",
-	}
-	dmsg := fmt.Sprint(logEvent.Data)
-	dmsg = strings.TrimLeft(dmsg, "[")
-	dmsg = strings.TrimRight(dmsg, "]")
-	data = append(data, "["+logEvent.Category+"] ")
 
-	data = append(data, dmsg)
-	logMsg := fmt.Sprint(data...)
+	logMsg := format(logEvent)
 	switch logEvent.Level {
 	case Error:
 		fmt.Printf(ErrorTemplate, logMsg)
diff --git a/file.go b/file.go
index babb370..5d56227 100644
--- a/file.go
+++ b/file.go
@@ -1,7 +1,6 @@
 package gologger
 
 import (
-	"fmt"
 	"os"
 	"path/filepath"
 )
@@ -25,15 +24,8 @@ func (f *FileAppender) Append(logEvent LogEvent) {
 		f.file, _ = os.OpenFile(f.filePath, os.O_APPEND|os.O_CREATE|os.O_WRONLY, 0644)
 	}
 
-	data := []interface{}{
-		logEvent.Ts.Format("2006-01-02 15:04:05"),
-		" ",
-	}
-	data = append(data, "["+logEvent.Category+"] ")
-	dmsg := fmt.Sprint(logEvent.Data...)
-	data = append(data, dmsg)
-	logMsg := fmt.Sprint(data...)
-	f.file.WriteString(logMsg + "\n")
+	logMsg := format(logEvent)
+	f.file.WriteString(logMsg)
 
 }
 
diff --git a/format.go b/format.go
new file mode 100644
index 0000000..48b3fa1
--- /dev/null
+++ b/format.go
@@ -0,0 +1,23 @@
+package gologger
+
+import (
+	"fmt"
+)
+
+const logTemplate = "[%s] %s - %s\n"
+
+func format(logEvent LogEvent) string {
+	data := logEvent.Ts.Format("2006-01-02 15:04:05")
+	msg := fmt.Sprint(logEvent.Data...)
+	ret := fmt.Sprintf(logTemplate, data, getLogLevelStr(logEvent.Level), msg)
+	return ret
+}
+
+func getLogLevelStr(level int) string {
+	for name, slevel := range logLevelMap {
+		if slevel == level {
+			return name
+		}
+	}
+	return "Unknown"
+}
diff --git a/log/fat.log b/log/fat.log
new file mode 100644
index 0000000..6cc48ad
--- /dev/null
+++ b/log/fat.log
@@ -0,0 +1,9 @@
+[2023-11-29 10:09:22] debug - [debug]
+[2023-11-29 10:09:22] debug - [debug again]
+[2023-11-29 10:09:22] error - [This is error]
+[2023-11-29 10:12:22] debug - debug
+[2023-11-29 10:12:22] debug - debug again
+[2023-11-29 10:12:22] error - This is error
+[2023-11-29 10:13:18] debug - debug
+[2023-11-29 10:13:18] debug - debug again
+[2023-11-29 10:13:18] error - This is error
diff --git a/main.go b/main.go
index c06b91f..13c22cd 100644
--- a/main.go
+++ b/main.go
@@ -118,6 +118,7 @@ func makeLogger(name string, config LogConfig) Logger {
 	logger := &Logger{category: name}
 	levelstr := strings.ToLower(config.Level)
 	logger.level = logLevelMap[levelstr]
+
 	if config.Appenders == nil || len(config.Appenders) == 0 {
 		logger.appenders = []LoggerAppender{consoleAppender}
 	} else {