Fixed trace function

Author: ricardorg79

debug/main.go

@@ -13,6 +13,7 @@ func main() {
 		w.SetLevel(log.DEBUG)
 		log.SetWriters([]log.Writer{w})
 	*/
+	log.SetTrace(true)
 	os.Setenv("LOG_CONFIG", "./config.properties")
 
 	log.Debug("Debug")

file_writer.go

@@ -4,8 +4,6 @@ import (
 	"fmt"
 	"os"
 	"path"
-	"runtime"
-	"time"
 )
 
 // FileSize represents the size of a file
@@ -64,21 +62,19 @@ func NewFileWriter(logDir, fileName string, maxSize FileSize, maxNumFiles int, l
 }
 
 type writeLogMsg struct {
-	mLevel Level
-	format string
-	args   []interface{}
+	preFormat string
+	args      []interface{}
 }
 
 // WriteLog implementation of logger.Writer
 func (fw *fileWriter) WriteLog(
-	mLevel Level,
+	messageLevel Level,
 	format string,
 	args []interface{},
 ) {
-	if fw.level < mLevel {
-		return
-	}
-	fw.logQueue <- &writeLogMsg{mLevel, format, args}
+	preformat(fw.level, messageLevel, format, func(preFormat string) {
+		fw.logQueue <- &writeLogMsg{preFormat, args}
+	})
 }
 
 func (fw *fileWriter) SetLevel(level Level) {
@@ -87,15 +83,7 @@ func (fw *fileWriter) SetLevel(level Level) {
 }
 
 func (fw *fileWriter) writeLog(m *writeLogMsg) {
-	var preFormat string
-	if IsTraceEnabled() {
-		_, file, line, _ := runtime.Caller(4)
-		preFormat = fmt.Sprintf("%s %s %s:%d %s\n", time.Now().Format(time.RFC3339), m.mLevel, file, line, m.format)
-	} else {
-		preFormat = fmt.Sprintf("%s %s %s\n", time.Now().Format(time.RFC3339), m.mLevel, m.format)
-	}
-
-	str := fmt.Sprintf(preFormat, m.args...)
+	str := fmt.Sprintf(m.preFormat, m.args...)
 	fw.fileLen += int64(len(str))
 	fmt.Fprint(fw.file, str)
 

logger.go

@@ -3,7 +3,9 @@ package log
 import (
 	"fmt"
 	"os"
+	"runtime"
 	"strings"
+	"time"
 
 	"github.com/magiconair/properties"
 )
@@ -156,3 +158,27 @@ func LoadLogProperties() {
 		SetWriters(logWriters)
 	}
 }
+
+func preformat(
+	writerLevel Level,
+	messageLevel Level,
+	format string,
+	do func(preFormat string),
+) {
+	if writerLevel < messageLevel {
+		return
+	}
+
+	var preFormatStr string
+	var preFormatArgs []interface{}
+	if IsTraceEnabled() {
+		_, file, line, _ := runtime.Caller(4)
+		preFormatStr = "%s %s %s:%d %s\n"
+		preFormatArgs = []interface{}{time.Now().Format(time.RFC3339), messageLevel.StringColor(), file, line, format}
+	} else {
+		preFormatStr = "%s %s %s\n"
+		preFormatArgs = []interface{}{time.Now().Format(time.RFC3339), messageLevel.StringColor(), format}
+	}
+
+	do(fmt.Sprintf(preFormatStr, preFormatArgs...))
+}

stdout_writer.go

@@ -2,8 +2,6 @@ package log
 
 import (
 	"fmt"
-	"runtime"
-	"time"
 )
 
 // WriterStdout writes to the standard output
@@ -18,27 +16,13 @@ func NewStdoutWriter(level Level) Writer {
 
 // WriteLog implementation of logger.Writer
 func (w *WriterStdout) WriteLog(
-	mLevel Level,
+	messageLevel Level,
 	format string,
 	args []interface{},
 ) {
-	if w.level < mLevel {
-		return
-	}
-
-	var preFormatStr string
-	var preFormatArgs []interface{}
-	if IsTraceEnabled() {
-		_, file, line, _ := runtime.Caller(4)
-		preFormatStr = "%s %s %s:%d %s\n"
-		preFormatArgs = []interface{}{time.Now().Format(time.RFC3339), mLevel.StringColor(), file, line, format}
-	} else {
-		preFormatStr = "%s %s %s\n"
-		preFormatArgs = []interface{}{time.Now().Format(time.RFC3339), mLevel.StringColor(), format}
-	}
-
-	preFormat := fmt.Sprintf(preFormatStr, preFormatArgs...)
-	fmt.Printf(preFormat, args...)
+	preformat(w.level, messageLevel, format, func(preFormat string) {
+		fmt.Printf(preFormat, args...)
+	})
 }
 
 // SetLevel sets the writer level