extern/rclone
1
0
Fork 0
mirror of https://github.com/rclone/rclone.git synced 2024-11-25 18:04:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

log: add object and objectType to json logs

Browse Source
This commit is contained in:
justina777 2019-08-02 22:57:09 +08:00 committed by Nick Craig-Wood
parent c2635e39cc
commit 94ee43fe54
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
fs/log.go
View File

@ -77,25 +77,33 @@ var LogPrint = func(level LogLevel, text string) {
// LogPrintf produces a log string from the arguments passed in // LogPrintf produces a log string from the arguments passed in
func LogPrintf(level LogLevel, o interface{}, text string, args ...interface{}) { func LogPrintf(level LogLevel, o interface{}, text string, args ...interface{}) {
out := fmt.Sprintf(text, args...) out := fmt.Sprintf(text, args...)
if o != nil {
out = fmt.Sprintf("%v: %s", o, out)
}
if Config.UseJSONLog { if Config.UseJSONLog {
fields := logrus.Fields{}
if o != nil {
fields = logrus.Fields{
"object": fmt.Sprintf("%+v", o),
"objectType": fmt.Sprintf("%T", o),
}
}
switch level { switch level {
case LogLevelDebug: case LogLevelDebug:
logrus.Debug(out) logrus.WithFields(fields).Debug(out)
case LogLevelInfo: case LogLevelInfo:
logrus.Info(out) logrus.WithFields(fields).Info(out)
case LogLevelNotice, LogLevelWarning: case LogLevelNotice, LogLevelWarning:
logrus.Warn(out) logrus.WithFields(fields).Warn(out)
case LogLevelError: case LogLevelError:
logrus.Error(out) logrus.WithFields(fields).Error(out)
case LogLevelCritical: case LogLevelCritical:
logrus.Fatal(out) logrus.WithFields(fields).Fatal(out)
case LogLevelEmergency, LogLevelAlert: case LogLevelEmergency, LogLevelAlert:
logrus.Panic(out) logrus.WithFields(fields).Panic(out)
} }
} else { } else {
if o != nil {
out = fmt.Sprintf("%v: %s", o, out)
}
LogPrint(level, out) LogPrint(level, out)
} }
} }