fix filename in log

formatters/json_formatter.go

@@ -9,7 +9,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/subchen/go-log"
+	"github.com/fangdingjun/go-log"
 )
 
 // JSONFormatter is a json formatter
@@ -41,7 +41,7 @@ func (f *JSONFormatter) Format(level log.Level, msg string, logger *log.Logger)
 	data := make(map[string]interface{}, 8)
 
 	// file, line
-	file, line := FilelineCaller(5)
+	file, line := FilelineCaller(4)
 
 	data["time"] = time.Now().Format(f.TimeFormat)
 	data["level"] = level.String()

formatters/text_formatter.go

@@ -8,7 +8,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/subchen/go-log"
+	"github.com/fangdingjun/go-log"
 )
 
 var (
@@ -83,7 +83,7 @@ func (f *TextFormatter) Format(level log.Level, msg string, logger *log.Logger)
 	buf.Write(f.pid)
 
 	// file, line
-	file, line := FilelineCaller(5)
+	file, line := FilelineCaller(4)
 	buf.WriteByte(' ')
 	buf.WriteString(file)
 	buf.WriteByte(':')

formatters/util_fileline.go

@@ -13,6 +13,11 @@ func FilelineCaller(skip int) (file string, line int) {
 			return "???", 0
 		}
 
+		//fmt.Printf("%s:%d\n", file, line)
+		if strings.Contains(file, "go-log/") {
+			continue
+		}
+
 		// file = pkg/file.go
 		n := 0
 		for i := len(file) - 1; i > 0; i-- {
@@ -24,11 +29,8 @@ func FilelineCaller(skip int) (file string, line int) {
 				}
 			}
 		}
-
-		if !strings.HasPrefix(file, "go-log/") {
 		return file, line
 	}
-	}
 
 	return "???", 0
 }