mirror of
https://github.com/rclone/rclone.git
synced 2025-03-11 05:25:14 +08:00
401cf81034
This commit modernizes Go usage. This was done with:
go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@latest -fix -test ./...
Then files needed to be `go fmt`ed and a few comments needed to be
restored.
The modernizations include replacing
- if/else conditional assignment by a call to the built-in min or max functions added in go1.21
- sort.Slice(x, func(i, j int) bool) { return s[i] < s[j] } by a call to slices.Sort(s), added in go1.21
- interface{} by the 'any' type added in go1.18
- append([]T(nil), s...) by slices.Clone(s) or slices.Concat(s), added in go1.21
- loop around an m[k]=v map update by a call to one of the Collect, Copy, Clone, or Insert functions from the maps package, added in go1.21
- []byte(fmt.Sprintf...) by fmt.Appendf(nil, ...), added in go1.19
- append(s[:i], s[i+1]...) by slices.Delete(s, i, i+1), added in go1.21
- a 3-clause for i := 0; i < n; i++ {} loop by for i := range n {}, added in go1.22
107 lines
2.3 KiB
Go
107 lines
2.3 KiB
Go
package log
|
|
|
|
import (
|
|
"fmt"
|
|
"runtime"
|
|
"strings"
|
|
|
|
"github.com/rclone/rclone/fs"
|
|
"github.com/sirupsen/logrus"
|
|
)
|
|
|
|
var loggerInstalled = false
|
|
|
|
// InstallJSONLogger installs the JSON logger at the specified log level
|
|
func InstallJSONLogger(logLevel fs.LogLevel) {
|
|
if !loggerInstalled {
|
|
logrus.AddHook(NewCallerHook())
|
|
loggerInstalled = true
|
|
}
|
|
logrus.SetFormatter(&logrus.JSONFormatter{
|
|
TimestampFormat: "2006-01-02T15:04:05.999999-07:00",
|
|
})
|
|
logrus.SetLevel(logrus.DebugLevel)
|
|
switch logLevel {
|
|
case fs.LogLevelEmergency, fs.LogLevelAlert:
|
|
logrus.SetLevel(logrus.PanicLevel)
|
|
case fs.LogLevelCritical:
|
|
logrus.SetLevel(logrus.FatalLevel)
|
|
case fs.LogLevelError:
|
|
logrus.SetLevel(logrus.ErrorLevel)
|
|
case fs.LogLevelWarning, fs.LogLevelNotice:
|
|
logrus.SetLevel(logrus.WarnLevel)
|
|
case fs.LogLevelInfo:
|
|
logrus.SetLevel(logrus.InfoLevel)
|
|
case fs.LogLevelDebug:
|
|
logrus.SetLevel(logrus.DebugLevel)
|
|
}
|
|
}
|
|
|
|
// install hook in fs to call to avoid circular dependency
|
|
func init() {
|
|
fs.InstallJSONLogger = InstallJSONLogger
|
|
}
|
|
|
|
// CallerHook for log the calling file and line of the fine
|
|
type CallerHook struct {
|
|
Field string
|
|
Skip int
|
|
levels []logrus.Level
|
|
}
|
|
|
|
// NewCallerHook use to make a hook
|
|
func NewCallerHook(levels ...logrus.Level) logrus.Hook {
|
|
hook := CallerHook{
|
|
Field: "source",
|
|
Skip: 7,
|
|
levels: levels,
|
|
}
|
|
if len(hook.levels) == 0 {
|
|
hook.levels = logrus.AllLevels
|
|
}
|
|
return &hook
|
|
}
|
|
|
|
// Levels implement applied hook to which levels
|
|
func (h *CallerHook) Levels() []logrus.Level {
|
|
return logrus.AllLevels
|
|
}
|
|
|
|
// Fire logs the information of context (filename and line)
|
|
func (h *CallerHook) Fire(entry *logrus.Entry) error {
|
|
entry.Data[h.Field] = findCaller(h.Skip)
|
|
return nil
|
|
}
|
|
|
|
// findCaller ignores the caller relevant to logrus or fslog then find out the exact caller
|
|
func findCaller(skip int) string {
|
|
file := ""
|
|
line := 0
|
|
for i := range 10 {
|
|
file, line = getCaller(skip + i)
|
|
if !strings.HasPrefix(file, "logrus") && !strings.Contains(file, "log.go") {
|
|
break
|
|
}
|
|
}
|
|
return fmt.Sprintf("%s:%d", file, line)
|
|
}
|
|
|
|
func getCaller(skip int) (string, int) {
|
|
_, file, line, ok := runtime.Caller(skip)
|
|
// fmt.Println(file,":",line)
|
|
if !ok {
|
|
return "", 0
|
|
}
|
|
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
|
|
}
|