feat(confg): reload on save and refactor logging (#275)

* feat(confg): reload on save

* refactor(logging): rework
This commit is contained in:
Ludvig Lundgren 2022-05-20 09:27:01 +02:00 committed by GitHub
parent 198528a474
commit 91b094f4f4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 995 additions and 873 deletions

View file

@ -2,71 +2,144 @@ package logger
import (
"io"
stdlog "log"
"os"
"time"
"github.com/autobrr/autobrr/internal/domain"
"github.com/dcarbone/zadapters/zstdlog"
"github.com/r3labs/sse/v2"
"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
"github.com/rs/zerolog/pkgerrors"
"gopkg.in/natefinch/lumberjack.v2"
)
var (
StdLogger *stdlog.Logger
StdLeveledLogger *stdlog.Logger
)
// Logger interface
type Logger interface {
Log() *zerolog.Event
Fatal() *zerolog.Event
Err(err error) *zerolog.Event
Error() *zerolog.Event
Warn() *zerolog.Event
Info() *zerolog.Event
Trace() *zerolog.Event
Debug() *zerolog.Event
With() zerolog.Context
RegisterSSEHook(sse *sse.Server)
SetLogLevel(level string)
}
func Setup(cfg domain.Config, sse *sse.Server) {
// DefaultLogger default logging controller
type DefaultLogger struct {
log zerolog.Logger
level zerolog.Level
writers []io.Writer
}
func New(cfg *domain.Config) Logger {
l := &DefaultLogger{
writers: make([]io.Writer, 0),
level: zerolog.DebugLevel,
}
// set log level
l.SetLogLevel(cfg.LogLevel)
// use pretty logging for dev only
if cfg.Version == "dev" {
// setup console writer
consoleWriter := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}
l.writers = append(l.writers, consoleWriter)
} else {
// default to stderr
l.writers = append(l.writers, os.Stderr)
}
if cfg.LogPath != "" {
l.writers = append(l.writers,
&lumberjack.Logger{
Filename: cfg.LogPath,
MaxSize: 50, // megabytes
MaxBackups: 3,
},
)
}
// set some defaults
zerolog.TimeFieldFormat = time.RFC3339
zerolog.ErrorStackMarshaler = pkgerrors.MarshalStack
switch cfg.LogLevel {
// init new logger
l.log = zerolog.New(io.MultiWriter(l.writers...)).With().Stack().Logger()
return l
}
func (l *DefaultLogger) RegisterSSEHook(sse *sse.Server) {
l.log = l.log.Hook(&ServerSentEventHook{sse: sse})
}
func (l *DefaultLogger) SetLogLevel(level string) {
switch level {
case "INFO":
l.level = zerolog.InfoLevel
zerolog.SetGlobalLevel(zerolog.InfoLevel)
case "DEBUG":
l.level = zerolog.DebugLevel
zerolog.SetGlobalLevel(zerolog.DebugLevel)
case "ERROR":
zerolog.SetGlobalLevel(zerolog.ErrorLevel)
l.level = zerolog.ErrorLevel
case "WARN":
zerolog.SetGlobalLevel(zerolog.WarnLevel)
l.level = zerolog.WarnLevel
case "TRACE":
l.level = zerolog.TraceLevel
zerolog.SetGlobalLevel(zerolog.TraceLevel)
default:
zerolog.SetGlobalLevel(zerolog.ErrorLevel)
l.level = zerolog.Disabled
}
// setup console writer
consoleWriter := zerolog.ConsoleWriter{Out: os.Stderr, TimeFormat: time.RFC3339}
writers := io.MultiWriter(consoleWriter)
// if logPath set create file writer
if cfg.LogPath != "" {
fileWriter := &lumberjack.Logger{
Filename: cfg.LogPath,
MaxSize: 100, // megabytes
MaxBackups: 3,
}
// overwrite writers
writers = io.MultiWriter(consoleWriter, fileWriter)
}
log.Logger = log.Hook(&ServerSentEventHook{sse: sse})
log.Logger = log.Output(writers)
// init a logger to use
//log := zerolog.New(os.Stdout)
// creates a *log.Logger with no level prefix
StdLogger = zstdlog.NewStdLogger(log.Logger)
// creates a *log.Logger with a level prefix
StdLeveledLogger = zstdlog.NewStdLoggerWithLevel(log.Logger, zerolog.TraceLevel)
}
// Log log something at fatal level.
func (l *DefaultLogger) Log() *zerolog.Event {
return l.log.Log().Time("time", time.Now())
}
// Fatal log something at fatal level. This will panic!
func (l *DefaultLogger) Fatal() *zerolog.Event {
return l.log.Fatal().Time("time", time.Now())
}
// Error log something at Error level
func (l *DefaultLogger) Error() *zerolog.Event {
return l.log.Error().Time("time", time.Now())
}
// Err log something at Err level
func (l *DefaultLogger) Err(err error) *zerolog.Event {
return l.log.Err(err).Time("time", time.Now())
}
// Warn log something at warning level.
func (l *DefaultLogger) Warn() *zerolog.Event {
return l.log.Warn().Time("time", time.Now())
}
// Info log something at fatal level.
func (l *DefaultLogger) Info() *zerolog.Event {
return l.log.Info().Time("time", time.Now())
}
// Debug log something at debug level.
func (l *DefaultLogger) Debug() *zerolog.Event {
return l.log.Debug().Time("time", time.Now())
}
// Trace log something at fatal level. This will panic!
func (l *DefaultLogger) Trace() *zerolog.Event {
return l.log.Trace().Time("time", time.Now())
}
// With log with context
func (l *DefaultLogger) With() zerolog.Context {
return l.log.With()
}