日志输出函数名 (#24)

feat: 日志输出增加方法名

Author: 小草

examples/custom-logger/logger.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"time"
@@ -76,11 +77,11 @@ func (f FileLogger) Sync() error {
 }
 
 func output(v ...interface{}) string {
-	_, file, line, _ := runtime.Caller(3)
-	files := strings.Split(file, "/")
-	file = files[len(files)-1]
+	pc, file, line, _ := runtime.Caller(3)
+	file = filepath.Base(file)
+	funcName := strings.TrimPrefix(filepath.Ext(runtime.FuncForPC(pc).Name()), ".")
 
-	logFormat := "%s %s:%d " + fmt.Sprint(v...) + "\n"
+	logFormat := "%s %s:%d:%s " + fmt.Sprint(v...) + "\n"
 	date := time.Now().Format("2006-01-02 15:04:05")
-	return fmt.Sprintf(logFormat, date, file, line)
+	return fmt.Sprintf(logFormat, date, file, line, funcName)
 }

examples/custom-logger/logger_test.go

@@ -6,6 +6,8 @@ import (
 
 func TestFileLogger_Debug(t *testing.T) {
 	l, err := New("./", DebugLevel)
-	t.Error(err)
+	if err != nil {
+		t.Error(err)
+	}
 	l.Debug("abc")
 }

log/console.go

@@ -2,6 +2,7 @@ package log
 
 import (
 	"fmt"
+	"path/filepath"
 	"runtime"
 	"strings"
 	"time"
@@ -58,11 +59,11 @@ func (consoleLogger) Sync() error {
 }
 
 func output(level string, v ...interface{}) {
-	_, file, line, _ := runtime.Caller(3)
-	files := strings.Split(file, "/")
-	file = files[len(files)-1]
+	pc, file, line, _ := runtime.Caller(3)
+	file = filepath.Base(file)
+	funcName := strings.TrimPrefix(filepath.Ext(runtime.FuncForPC(pc).Name()), ".")
 
-	logFormat := "[%s] %s %s:%d " + fmt.Sprint(v...) + "\n"
+	logFormat := "[%s] %s %s:%d:%s " + fmt.Sprint(v...) + "\n"
 	date := time.Now().Format("2006-01-02 15:04:05")
-	fmt.Printf(logFormat, level, date, file, line)
+	fmt.Printf(logFormat, level, date, file, line, funcName)
 }