4647660776
## ⚠️ Breaking The `log.<mode>.<logger>` style config has been dropped. If you used it, please check the new config manual & app.example.ini to make your instance output logs as expected. Although many legacy options still work, it's encouraged to upgrade to the new options. The SMTP logger is deleted because SMTP is not suitable to collect logs. If you have manually configured Gitea log options, please confirm the logger system works as expected after upgrading. ## Description Close #12082 and maybe more log-related issues, resolve some related FIXMEs in old code (which seems unfixable before) Just like rewriting queue #24505 : make code maintainable, clear legacy bugs, and add the ability to support more writers (eg: JSON, structured log) There is a new document (with examples): `logging-config.en-us.md` This PR is safer than the queue rewriting, because it's just for logging, it won't break other logic. ## The old problems The logging system is quite old and difficult to maintain: * Unclear concepts: Logger, NamedLogger, MultiChannelledLogger, SubLogger, EventLogger, WriterLogger etc * Some code is diffuclt to konw whether it is right: `log.DelNamedLogger("console")` vs `log.DelNamedLogger(log.DEFAULT)` vs `log.DelLogger("console")` * The old system heavily depends on ini config system, it's difficult to create new logger for different purpose, and it's very fragile. * The "color" trick is difficult to use and read, many colors are unnecessary, and in the future structured log could help * It's difficult to add other log formats, eg: JSON format * The log outputer doesn't have full control of its goroutine, it's difficult to make outputer have advanced behaviors * The logs could be lost in some cases: eg: no Fatal error when using CLI. * Config options are passed by JSON, which is quite fragile. * INI package makes the KEY in `[log]` section visible in `[log.sub1]` and `[log.sub1.subA]`, this behavior is quite fragile and would cause more unclear problems, and there is no strong requirement to support `log.<mode>.<logger>` syntax. ## The new design See `logger.go` for documents. ## Screenshot <details>    </details> ## TODO * [x] add some new tests * [x] fix some tests * [x] test some sub-commands (manually ....) --------- Co-authored-by: Jason Song <i@wolfogre.com> Co-authored-by: delvh <dev.lh@web.de> Co-authored-by: Giteabot <teabot@gitea.io>
78 lines
1.7 KiB
Go
78 lines
1.7 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package log
|
|
|
|
import (
|
|
"io"
|
|
)
|
|
|
|
type baseToLogger struct {
|
|
base BaseLogger
|
|
}
|
|
|
|
// BaseLoggerToGeneralLogger wraps a BaseLogger (which only has Log() function) to a Logger (which has Info() function)
|
|
func BaseLoggerToGeneralLogger(b BaseLogger) Logger {
|
|
l := &baseToLogger{base: b}
|
|
return l
|
|
}
|
|
|
|
var _ Logger = (*baseToLogger)(nil)
|
|
|
|
func (s *baseToLogger) Log(skip int, level Level, format string, v ...any) {
|
|
s.base.Log(skip+1, level, format, v...)
|
|
}
|
|
|
|
func (s *baseToLogger) GetLevel() Level {
|
|
return s.base.GetLevel()
|
|
}
|
|
|
|
func (s *baseToLogger) LevelEnabled(level Level) bool {
|
|
return s.base.GetLevel() <= level
|
|
}
|
|
|
|
func (s *baseToLogger) Trace(format string, v ...any) {
|
|
s.base.Log(1, TRACE, format, v...)
|
|
}
|
|
|
|
func (s *baseToLogger) Debug(format string, v ...any) {
|
|
s.base.Log(1, DEBUG, format, v...)
|
|
}
|
|
|
|
func (s *baseToLogger) Info(format string, v ...any) {
|
|
s.base.Log(1, INFO, format, v...)
|
|
}
|
|
|
|
func (s *baseToLogger) Warn(format string, v ...any) {
|
|
s.base.Log(1, WARN, format, v...)
|
|
}
|
|
|
|
func (s *baseToLogger) Error(format string, v ...any) {
|
|
s.base.Log(1, ERROR, format, v...)
|
|
}
|
|
|
|
func (s *baseToLogger) Critical(format string, v ...any) {
|
|
s.base.Log(1, CRITICAL, format, v...)
|
|
}
|
|
|
|
type PrintfLogger struct {
|
|
Logf func(format string, args ...any)
|
|
}
|
|
|
|
func (p *PrintfLogger) Printf(format string, args ...any) {
|
|
p.Logf(format, args...)
|
|
}
|
|
|
|
type loggerToWriter struct {
|
|
logf func(format string, args ...any)
|
|
}
|
|
|
|
func (p *loggerToWriter) Write(bs []byte) (int, error) {
|
|
p.logf("%s", string(bs))
|
|
return len(bs), nil
|
|
}
|
|
|
|
// LoggerToWriter wraps a log function to an io.Writer
|
|
func LoggerToWriter(logf func(format string, args ...any)) io.Writer {
|
|
return &loggerToWriter{logf: logf}
|
|
}
|