use standard log/slog instead of zerolog

Author: merlinfuchs

README.md

@@ -94,11 +94,10 @@ Look at the [default config](internal/config/default.config.toml) for other valu
 
 ## Logging
 
-Because logging to STDOUT is pointless because STDOUT is already used for the UI output, you can find log messages in a file called `blimp.log`.
+Blimp will log errors and warning to STDERR. Because STDOUT is already used for the UI it can be hard to spot the errors.
 
-If you want blimp to write to a different logfile you can set it in the config like this:
+To be able to see the log messages you can redirect the STDERR output to a file:
 
-```toml
-[logging]
-filename = "blimp.log"
+```shell
+blimp 2>> blimp.log
 ```

go.mod

@@ -13,8 +13,6 @@ require (
 	github.com/mmcdole/gofeed v1.2.1
 	github.com/prometheus-community/pro-bing v0.3.0
 	github.com/rivo/tview v0.0.0-20230826141931-7344139b5532
-	github.com/rs/zerolog v1.30.0
-	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 )
 
 require (
@@ -26,8 +24,6 @@ require (
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
-	github.com/mattn/go-colorable v0.1.12 // indirect
-	github.com/mattn/go-isatty v0.0.14 // indirect
 	github.com/mattn/go-runewidth v0.0.14 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect

go.sum

@@ -2,7 +2,6 @@ github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0g
 github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI=
 github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c=
 github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA=
-github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -12,7 +11,6 @@ github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdk
 github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg=
 github.com/gdamore/tcell/v2 v2.6.0 h1:OKbluoP9VYmJwZwq/iLb4BxwKcwGthaa1YNBJIyCySg=
 github.com/gdamore/tcell/v2 v2.6.0/go.mod h1:be9omFATkdr0D9qewWW3d+MEvl5dha+Etb5y65J2H8Y=
-github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -34,10 +32,6 @@ github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g=
 github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus=
 github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY=
 github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40=
-github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
-github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y=
-github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-runewidth v0.0.14 h1:+xnbZSEeDbOIg5/mE6JF0w6n9duR1l3/WmbinWVwUuU=
 github.com/mattn/go-runewidth v0.0.14/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
@@ -57,7 +51,6 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
 github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus-community/pro-bing v0.3.0 h1:SFT6gHqXwbItEDJhTkzPWVqU6CLEtqEfNAPp47RUON4=
@@ -67,9 +60,6 @@ github.com/rivo/tview v0.0.0-20230826141931-7344139b5532/go.mod h1:nVwGv4MP47T0j
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.3 h1:utMvzDsuh3suAEnhH0RdHmoPbU648o6CvXxTx4SBMOw=
 github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
-github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
-github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c=
-github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
@@ -91,8 +81,6 @@ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5h
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -115,6 +103,4 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-gopkg.in/natefinch/lumberjack.v2 v2.2.1 h1:bBRl1b0OH9s/DuPhuXpNl+VtCaJXFZ5/uEFST95x9zc=
-gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYskCTPBJVb9jqSc=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

internal/config/config.go

@@ -2,14 +2,16 @@ package config
 
 import (
 	"errors"
+	"fmt"
 	"os"
 	"strings"
 
+	"log/slog"
+
 	"github.com/knadh/koanf/parsers/toml"
 	"github.com/knadh/koanf/providers/env"
 	"github.com/knadh/koanf/providers/file"
 	"github.com/knadh/koanf/v2"
-	"github.com/rs/zerolog/log"
 )
 
 var K = koanf.New(".")
@@ -32,14 +34,16 @@ func InitConfig() {
 
 	if err := K.Load(file.Provider(configName), toml.Parser()); err != nil {
 		if !errors.Is(err, os.ErrNotExist) {
-			log.Panic().Err(err).Msgf("Failed to load config file %s", configName)
+			slog.With("error", err).Error(fmt.Sprintf("Failed to load config file %s", configName))
+			panic(err)
 		}
 	}
 
 	if err := K.Load(env.Provider(envVarPrefix, ".", func(s string) string {
 		return strings.Replace(strings.ToLower(
 			strings.TrimPrefix(s, envVarPrefix)), "_", ".", -1)
 	}), nil); err != nil {
-		log.Panic().Err(err).Msgf("Failed to load env vars")
+		slog.With("error", err).Error("Failed to load config from environment")
+		panic(err)
 	}
 }

internal/config/default.config.toml

@@ -33,9 +33,3 @@ update_interval = 60000 # 1 minutes
 max_items = 0 # 0 means auto
 show_feed_title = true
 show_published_time = true
-
-[logging]
-filename = "blimp.log"
-max_size = 1 # in MB
-max_age = 7 # in days
-max_backups = 5 # // note: old ones will still be deleted after max_age

internal/config/defaults.go

@@ -2,17 +2,18 @@ package config
 
 import (
 	_ "embed"
+	"log/slog"
 
 	"github.com/knadh/koanf/parsers/toml"
 	"github.com/knadh/koanf/providers/rawbytes"
-	"github.com/rs/zerolog/log"
 )
 
 //go:embed default.config.toml
 var defaultConfigTomlBytes []byte
 
 func setupDefaults() {
 	if err := K.Load(rawbytes.Provider(defaultConfigTomlBytes), toml.Parser()); err != nil {
-		log.Panic().Err(err).Msgf("Failed to load default config")
+		slog.With("error", err).Error("Failed to load default config")
+		panic(err)
 	}
 }

internal/logging/logging.go

@@ -1,32 +1,21 @@
 package logging
 
 import (
-	"io"
+	"log/slog"
 	"os"
 
 	"github.com/merlinfuchs/blimp/internal/config"
-	"github.com/rs/zerolog"
-	"github.com/rs/zerolog/log"
-	"gopkg.in/natefinch/lumberjack.v2"
 )
 
 func InitLogger() {
-	logContext := log.With()
-
-	logWriters := make([]io.Writer, 0)
-	logWriters = append(logWriters, &lumberjack.Logger{
-		Filename:   config.K.String("logging.filename"),
-		MaxSize:    config.K.Int("logging.max_size"),
-		MaxAge:     config.K.Int("logging.max_age"),
-		MaxBackups: config.K.Int("logging.max_backups"),
-	})
+	logLevel := slog.LevelInfo
 	if config.K.Bool("debug") {
-		zerolog.SetGlobalLevel(zerolog.DebugLevel)
-		logWriters = append(logWriters, zerolog.ConsoleWriter{Out: os.Stdout})
-	} else {
-		zerolog.SetGlobalLevel(zerolog.InfoLevel)
+		logLevel = slog.LevelDebug
 	}
 
-	writer := io.MultiWriter(logWriters...)
-	log.Logger = logContext.Logger().Output(writer)
+	logger := slog.New(slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{
+		Level: logLevel,
+	}))
+
+	slog.SetDefault(logger)
 }

internal/widgets/feeds/feeds.go

@@ -3,11 +3,11 @@ package feeds
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"sort"
 	"time"
 
 	"github.com/mmcdole/gofeed"
-	"github.com/rs/zerolog/log"
 
 	"github.com/gdamore/tcell/v2"
 	"github.com/merlinfuchs/blimp/internal/config"
@@ -24,7 +24,8 @@ type FeedsView struct {
 func New() *FeedsView {
 	targets := make([]FeedTarget, 0)
 	if err := config.K.Unmarshal("widgets.feeds.targets", &targets); err != nil {
-		log.Panic().Err(err).Msgf("Failed to unmarshal status targets")
+		slog.With("error", err).Error("Failed to unmarshal status targets")
+		panic(err)
 	}
 
 	view := tview.NewFlex().SetDirection(tview.FlexRow)
@@ -66,7 +67,7 @@ func (l *FeedsView) updateItems() {
 
 		feed, err := fp.ParseURLWithContext(target.URL, ctx)
 		if err != nil {
-			log.Error().Err(err).Msgf("Failed to fetch feed %s", target.URL)
+			slog.With("error", err).Error("Failed to fetch feed", "url", target.URL)
 			continue
 		}
 
@@ -82,7 +83,7 @@ func (l *FeedsView) updateItems() {
 		publishedI := items[i].Item.PublishedParsed
 		publishedJ := items[j].Item.PublishedParsed
 		if publishedI == nil || publishedJ == nil {
-			log.Warn().Msgf("Failed to sort feeds, missing published date")
+			slog.Warn("Failed to sort feeds, missing published date")
 			return true
 		}
 		return publishedI.After(*publishedJ)

internal/widgets/latency/latency.go

@@ -3,12 +3,13 @@ package latency
 import (
 	"time"
 
+	"log/slog"
+
 	"github.com/gdamore/tcell/v2"
 	"github.com/guptarohit/asciigraph"
 	"github.com/merlinfuchs/blimp/internal/config"
 	ping "github.com/prometheus-community/pro-bing"
 	"github.com/rivo/tview"
-	"github.com/rs/zerolog/log"
 )
 
 type LatencyView struct {
@@ -51,7 +52,7 @@ func (l *LatencyView) Start() {
 				var err error
 				pinger, err = ping.NewPinger(config.K.String("widgets.latency.target_host"))
 				if err != nil {
-					log.Error().Err(err).Msgf("Failed to create pinger")
+					slog.With("error", err).Error("Failed to create pinger")
 					return
 				}
 
@@ -65,7 +66,7 @@ func (l *LatencyView) Start() {
 
 				err = pinger.Run()
 				if err != nil {
-					log.Error().Err(err).Msgf("Failed to run pinger, latency won't be displayed")
+					slog.With("error", err).Error("Failed to run pinger, latency won't be displayed")
 				}
 			}
 		}

internal/widgets/status/status.go

@@ -3,11 +3,10 @@ package status
 import (
 	"context"
 	"fmt"
+	"log/slog"
 	"net/http"
 	"time"
 
-	"github.com/rs/zerolog/log"
-
 	"github.com/gdamore/tcell/v2"
 	"github.com/merlinfuchs/blimp/internal/config"
 	ping "github.com/prometheus-community/pro-bing"
@@ -24,7 +23,8 @@ type StatusView struct {
 func New() *StatusView {
 	targets := make([]StatusTarget, 0)
 	if err := config.K.Unmarshal("widgets.status.targets", &targets); err != nil {
-		log.Panic().Err(err).Msgf("Failed to unmarshal status targets")
+		slog.With("error", err).Error("Failed to unmarshal status targets")
+		panic(err)
 	}
 
 	view := tview.NewFlex().SetDirection(tview.FlexRow)
@@ -79,8 +79,8 @@ func (l *StatusView) updateData() {
 		case "ping":
 			pinger, err := ping.NewPinger(target.Host)
 			if err != nil {
-				log.Fatal().Err(err).Msgf("Failed to create pinger, latency won't be displayed")
-				return
+				slog.With("error", err).Error("Failed to create pinger, latency won't be displayed")
+				panic(err)
 			}
 
 			pinger.SetPrivileged(false)
@@ -104,7 +104,7 @@ func (l *StatusView) updateData() {
 				}
 			}
 		default:
-			log.Error().Msgf("Unknown status target type %s", target.Type)
+			slog.Error(fmt.Sprintf("Unknown status target type %s", target.Type))
 		}
 	}
 }

internal/widgets/weather/api.go

@@ -60,6 +60,10 @@ func getCurrentWeatherData() (CurrentWeatherData, error) {
 		return CurrentWeatherData{}, fmt.Errorf("Failed to get weather data, %w", err)
 	}
 
+	if resp.StatusCode >= 300 || resp.StatusCode < 200 {
+		return CurrentWeatherData{}, fmt.Errorf("Failed to get current weather data, status code %d", resp.StatusCode)
+	}
+
 	var data CurrentWeatherData
 	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
 		return CurrentWeatherData{}, fmt.Errorf("Failed to decode weather data, %w", err)
@@ -83,6 +87,10 @@ func getWeatherForecast() (ForecastWeatherData, error) {
 		return ForecastWeatherData{}, fmt.Errorf("Failed to get weather data, %w", err)
 	}
 
+	if resp.StatusCode >= 300 || resp.StatusCode < 200 {
+		return ForecastWeatherData{}, fmt.Errorf("Failed to get weather forecast data, status code %d", resp.StatusCode)
+	}
+
 	var data ForecastWeatherData
 	if err := json.NewDecoder(resp.Body).Decode(&data); err != nil {
 		return ForecastWeatherData{}, fmt.Errorf("Failed to decode weather data, %w", err)

internal/widgets/weather/weather.go

@@ -4,11 +4,12 @@ import (
 	"fmt"
 	"time"
 
+	"log/slog"
+
 	"github.com/gdamore/tcell/v2"
 	"github.com/merlinfuchs/blimp/internal/config"
 	"github.com/merlinfuchs/blimp/internal/widgets/weather/icons"
 	"github.com/rivo/tview"
-	"github.com/rs/zerolog/log"
 )
 
 type StatusView struct {
@@ -60,14 +61,14 @@ func (l *StatusView) updateData() {
 
 	currentWeather, err := getCurrentWeatherData()
 	if err != nil {
-		log.Error().Err(err).Msgf("Failed to get current weather data")
+		slog.With("error", err).Error("Failed to get current weather data", "error")
 		return
 	}
 	l.currentWeather = &currentWeather
 
 	forecastWeather, err := getWeatherForecast()
 	if err != nil {
-		log.Error().Err(err).Msgf("Failed to get forecast weather data")
+		slog.With("error", err).Error("Failed to get weather forecast data")
 		return
 	}
 	l.forecastWeather = &forecastWeather

main.go

@@ -3,10 +3,11 @@ package main
 import (
 	"fmt"
 
+	"log/slog"
+
 	"github.com/merlinfuchs/blimp/internal"
 	"github.com/merlinfuchs/blimp/internal/config"
 	"github.com/merlinfuchs/blimp/internal/logging"
-	"github.com/rs/zerolog/log"
 )
 
 var outDatedConfigKeys = []string{
@@ -27,6 +28,6 @@ func main() {
 
 	err := internal.AppEntry()
 	if err != nil {
-		log.Fatal().Err(err).Msg("Failed to start app")
+		slog.With("error", err).Error("Failed to start blimp")
 	}
 }