From 91f05e210ee76906f8419e1b49814f6ac643f9f0 Mon Sep 17 00:00:00 2001 From: miyuko Date: Sun, 7 Dec 2025 13:09:24 +0000 Subject: [PATCH] [breaking-change] Remove the `log-level` config option. This reverts commit 351d0a0c85a946d5a453b36ffbc5fe8a64f52a5f. This option does not have any effect at the moment and may potentially confuse users. It can be easily reintroduced later (by reverting this commit) once we start logging at any level other than `info`. --- conf/config.example.toml | 1 - src/config.go | 1 - src/observe.go | 33 ++------------------------------- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/conf/config.example.toml b/conf/config.example.toml index e7f528b..a2c76b7 100644 --- a/conf/config.example.toml +++ b/conf/config.example.toml @@ -2,7 +2,6 @@ # as the intrinsic default value. log-format = "text" -log-level = "info" [server] # Use "-" to disable the handler. diff --git a/src/config.go b/src/config.go index 2866b93..6df7a19 100644 --- a/src/config.go +++ b/src/config.go @@ -63,7 +63,6 @@ type Config struct { Insecure bool `toml:"-" env:"insecure"` Features []string `toml:"features"` LogFormat string `toml:"log-format" default:"text"` - LogLevel string `toml:"log-level" default:"info"` Server ServerConfig `toml:"server"` Wildcard []WildcardConfig `toml:"wildcard"` Fallback FallbackConfig `toml:"fallback"` diff --git a/src/observe.go b/src/observe.go index c2656e2..752e1dd 100644 --- a/src/observe.go +++ b/src/observe.go @@ -13,7 +13,6 @@ import ( "os" "runtime/debug" "strconv" - "strings" "sync" "time" @@ -62,29 +61,15 @@ func InitObservability() { logHandlers := []slog.Handler{} - logLevel := slog.LevelInfo - switch strings.ToLower(config.LogLevel) { - case "debug": - logLevel = slog.LevelDebug - case "info": - logLevel = slog.LevelInfo - case "warn": - logLevel = slog.LevelWarn - case "error": - logLevel = slog.LevelError - default: - log.Println("unknown log level", config.LogLevel) - } - switch config.LogFormat { case "none": // nothing to do case "text": logHandlers = append(logHandlers, - slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{Level: logLevel})) + slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{})) case "json": logHandlers = append(logHandlers, - slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{Level: logLevel})) + slog.NewJSONHandler(os.Stderr, &slog.HandlerOptions{})) default: log.Println("unknown log format", config.LogFormat) } @@ -93,7 +78,6 @@ func InitObservability() { var err error syslogHandler, err = syslog.NewHandler(&syslog.HandlerOptions{ Address: syslogAddr, - Level: logLevel, AppName: "git-pages", StructuredDataID: "git-pages", }) @@ -154,7 +138,6 @@ func InitObservability() { if enableLogs { logHandlers = append(logHandlers, sentryslog.Option{ AddSource: true, - LogLevel: levelsFromMinimum(logLevel), }.NewSentryHandler(context.Background())) } } @@ -162,18 +145,6 @@ func InitObservability() { slog.SetDefault(slog.New(slogmulti.Fanout(logHandlers...))) } -// From sentryslog, because for some reason they don't make it public. -func levelsFromMinimum(minLevel slog.Level) []slog.Level { - allLevels := []slog.Level{slog.LevelDebug, slog.LevelInfo, slog.LevelWarn, slog.LevelError, sentryslog.LevelFatal} - var result []slog.Level - for _, level := range allLevels { - if level >= minLevel { - result = append(result, level) - } - } - return result -} - func FiniObservability() { var wg sync.WaitGroup timeout := 2 * time.Second