Merge branch 'master' of https://github.com/xiaomi-tc/log15

format.go

@@ -92,7 +92,14 @@ func LogfmtFormat() Format {
 		logMetaKey = r.MetaK
 		logMetaValue = r.MetaV
 
-		common := []interface{}{r.KeyNames.Time, r.Time, r.KeyNames.Lvl, r.Lvl, r.KeyNames.Call, r.Call.String(), r.KeyNames.Msg, r.Msg}
+		var caller string
+		if r.CustomCaller == "" {
+			caller = r.Call.String()
+		} else {
+			caller = r.CustomCaller
+		}
+
+		common := []interface{}{r.KeyNames.Time, r.Time, r.KeyNames.Lvl, r.Lvl, r.KeyNames.Call, caller, r.KeyNames.Msg, r.Msg}
 		buf := &bytes.Buffer{}
 		logfmt(buf, append(common, r.Ctx...), 0)
 		return buf.Bytes()

logger.go

@@ -94,6 +94,7 @@ type Record struct {
 	MetaV    string
 	Ctx      []interface{}
 	Call     stack.Call
+	CustomCaller string
 	KeyNames RecordKeyNames
 }
 
@@ -179,6 +180,27 @@ func (l *logger) writeMeta(msg string, lvl Lvl, metaType Meta, metaData interfac
 	}
 }
 
+func (l *logger) writeGorm(msg string, lvl Lvl, caller string, ctx []interface{}) {
+	if lvl <= l.setLv {
+		newCtx := make([]interface{}, 0, len(ctx))
+		newCtx = append(newCtx, ctx...)
+
+		l.h.Log(&Record{
+			Time:  time.Now(),
+			Lvl:   lvl,
+			Msg:   msg,
+			Ctx:   newContext(l.ctx, newCtx),
+			CustomCaller:caller,
+			KeyNames: RecordKeyNames{
+				Time: timeKey,
+				Msg:  msgKey,
+				Lvl:  lvlKey,
+				Call: callKey,
+			},
+		})
+	}
+}
+
 func (l *logger) New(ctx ...interface{}) Logger {
 	//child := &logger{newContext(l.ctx, ctx), new(swapHandler)}  // increase one parament --[stevenmi]
 	child := &logger{newContext(l.ctx, ctx), new(swapHandler), LvlDebug}

root.go

@@ -75,3 +75,8 @@ func Crit(msg string, ctx ...interface{}) {
 func MetaDebug(msg string, metaType Meta, metaData interface{}, ctx ...interface{}) {
 	root.writeMeta(msg, LvlDebug, metaType, metaData, ctx)
 }
+
+// GormInfo is used to support gorm logger
+func GormInfo(msg string, caller string, ctx ...interface{}) {
+	root.writeGorm(msg, LvlInfo, caller, ctx)
+}