Merge branch 'tuoyun' of github.com:OpenIMSDK/Open-IM-Server into tuoyun

pkg/common/log/file_line_hk.go

@@ -7,7 +7,7 @@
 package log
 
 import (
-	"fmt"
+	"Open_IM/pkg/utils"
 	"github.com/sirupsen/logrus"
 	"runtime"
 	"strings"
@@ -23,38 +23,49 @@ func (f *fileHook) Levels() []logrus.Level {
 	return logrus.AllLevels
 }
 
-func (f *fileHook) Fire(entry *logrus.Entry) error {
+//func (f *fileHook) Fire(entry *logrus.Entry) error {
-	entry.Data["FilePath"] = findCaller(6)
+//	entry.Data["FilePath"] = findCaller(6)
-	return nil
+//	return nil
-}
+//}
 
-func findCaller(skip int) string {
+func (f *fileHook) Fire(entry *logrus.Entry) error {
-	file := ""
+	var s string
-	line := 0
+	_, b, c, _ := runtime.Caller(8)
-	for i := 0; i < 10; i++ {
+	i := strings.LastIndex(b, "/")
-		file, line = getCaller(skip + i)
+	if i != -1 {
-		if !strings.HasPrefix(file, "log") {
+		s = b[i+1:len(b)] + ":" + utils.IntToString(c)
-			break
-		}
 	}
-	return fmt.Sprintf("%s:%d", file, line)
+	entry.Data["FilePath"] = s
+	return nil
 }
 
-func getCaller(skip int) (string, int) {
+//func findCaller(skip int) string {
-	_, file, line, ok := runtime.Caller(skip)
+//	file := ""
-	if !ok {
+//	line := 0
-		return "", 0
+//	for i := 0; i < 10; i++ {
-	}
+//		file, line = getCaller(skip + i)
-
+//		if !strings.HasPrefix(file, "log") {
-	n := 0
+//			break
-	for i := len(file) - 1; i > 0; i-- {
+//		}
-		if file[i] == '/' {
+//	}
-			n++
+//	return fmt.Sprintf("%s:%d", file, line)
-			if n >= 2 {
+//}
-				file = file[i+1:]
+//
-				break
+//func getCaller(skip int) (string, int) {
-			}
+//	_, file, line, ok := runtime.Caller(skip)
-		}
+//	if !ok {
-	}
+//		return "", 0
-	return file, line
+//	}
-}
+//
+//	n := 0
+//	for i := len(file) - 1; i > 0; i-- {
+//		if file[i] == '/' {
+//			n++
+//			if n >= 2 {
+//				file = file[i+1:]
+//				break
+//			}
+//		}
+//	}
+//	return file, line
+//}