ehlxr/go-utils
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update log.go

Browse Source
This commit is contained in:
ehlxr 2017-06-25 14:04:12 +08:00
parent d37fa0e399
commit b67bf6d48b
1 changed files with 78 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
log/log.go
View File

@ -74,6 +74,14 @@ func Debug(args ...interface{}) {
} }
} }
func Debugf(format string, args ...interface{}) {
if fn {
mylog.WithField("prefix", fileInfo(2)).Debugf(format, args...)
} else {
mylog.Debugf(format, args...)
}
}
func DebugWithFields(fields Fields, args ...interface{}) { func DebugWithFields(fields Fields, args ...interface{}) {
entry := mylog.WithFields(logrus.Fields(fields)) entry := mylog.WithFields(logrus.Fields(fields))
@ -81,7 +89,15 @@ func DebugWithFields(fields Fields, args ...interface{}) {
entry.Data["prefix"] = fileInfo(2) entry.Data["prefix"] = fileInfo(2)
} }
entry.Debug(args...) entry.Debug(args...)
}
func DebugfWithFields(fields Fields, format string, args ...interface{}) {
entry := mylog.WithFields(logrus.Fields(fields))
if fn {
entry.Data["prefix"] = fileInfo(2)
}
entry.Debugf(format, args...)
} }
func Info(args ...interface{}) { func Info(args ...interface{}) {
@ -94,9 +110,9 @@ func Info(args ...interface{}) {
func Infof(format string, args ...interface{}) { func Infof(format string, args ...interface{}) {
if fn { if fn {
mylog.WithField("prefix", fileInfo(2)).Infof(format, args) mylog.WithField("prefix", fileInfo(2)).Infof(format, args...)
} else { } else {
mylog.Infof(format, args) mylog.Infof(format, args...)
} }
} }
@ -110,6 +126,15 @@ func InfoWithFields(fields Fields, args ...interface{}) {
} }
func InfofWithFields(fields Fields, format string, args ...interface{}) {
entry := mylog.WithFields(logrus.Fields(fields))
if fn {
entry.Data["prefix"] = fileInfo(2)
}
entry.Infof(format, args...)
}
func Error(args ...interface{}) { func Error(args ...interface{}) {
if fn { if fn {
mylog.WithField("prefix", fileInfo(2)).Error(args...) mylog.WithField("prefix", fileInfo(2)).Error(args...)
@ -118,6 +143,14 @@ func Error(args ...interface{}) {
} }
} }
func Errorf(format string, args ...interface{}) {
if fn {
mylog.WithField("prefix", fileInfo(2)).Errorf(format, args...)
} else {
mylog.Errorf(format, args...)
}
}
func ErrorWithFields(fields Fields, args ...interface{}) { func ErrorWithFields(fields Fields, args ...interface{}) {
entry := mylog.WithFields(logrus.Fields(fields)) entry := mylog.WithFields(logrus.Fields(fields))
@ -128,6 +161,15 @@ func ErrorWithFields(fields Fields, args ...interface{}) {
} }
func ErrorfWithFields(fields Fields, format string, args ...interface{}) {
entry := mylog.WithFields(logrus.Fields(fields))
if fn {
entry.Data["prefix"] = fileInfo(2)
}
entry.Errorf(format, args...)
}
func Fatal(args ...interface{}) { func Fatal(args ...interface{}) {
if fn { if fn {
mylog.WithField("prefix", fileInfo(2)).Fatal(args...) mylog.WithField("prefix", fileInfo(2)).Fatal(args...)
@ -136,6 +178,14 @@ func Fatal(args ...interface{}) {
} }
} }
func Fatalf(format string, args ...interface{}) {
if fn {
mylog.WithField("prefix", fileInfo(2)).Fatalf(format, args...)
} else {
mylog.Fatalf(format, args...)
}
}
func FatalWithFields(fields Fields, args ...interface{}) { func FatalWithFields(fields Fields, args ...interface{}) {
entry := mylog.WithFields(logrus.Fields(fields)) entry := mylog.WithFields(logrus.Fields(fields))
@ -143,7 +193,15 @@ func FatalWithFields(fields Fields, args ...interface{}) {
entry.Data["prefix"] = fileInfo(2) entry.Data["prefix"] = fileInfo(2)
} }
entry.Fatal(args...) entry.Fatal(args...)
}
func FatalfWithFields(fields Fields, format string, args ...interface{}) {
entry := mylog.WithFields(logrus.Fields(fields))
if fn {
entry.Data["prefix"] = fileInfo(2)
}
entry.Fatalf(format, args...)
} }
func Panic(args ...interface{}) { func Panic(args ...interface{}) {
@ -154,12 +212,28 @@ func Panic(args ...interface{}) {
} }
} }
func Panicf(format string, args ...interface{}) {
if fn {
mylog.WithField("prefix", fileInfo(2)).Panicf(format, args...)
} else {
mylog.Panicf(format, args...)
}
}
func PanicWithFields(fields Fields, args ...interface{}) { func PanicWithFields(fields Fields, args ...interface{}) {
entry := mylog.WithFields(logrus.Fields(fields)) entry := mylog.WithFields(logrus.Fields(fields))
if fn { if fn {
entry.Data["prefix"] = fileInfo(2) entry.Data["prefix"] = fileInfo(2)
} }
entry.Info(args...) entry.Panic(args...)
}
func PanicfWithFields(fields Fields, format string, args ...interface{}) {
entry := mylog.WithFields(logrus.Fields(fields))
if fn {
entry.Data["prefix"] = fileInfo(2)
}
entry.Panicf(format, args...)
} }