From 0af1a6e12148f4e9ed1192842db8c86fa54cf915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Guillot?= Date: Sun, 6 Apr 2025 15:34:41 -0700 Subject: [PATCH] refactor: avoid logging twice the feed errors in the background worker --- internal/reader/handler/handler.go | 7 ++++++- internal/worker/worker.go | 8 -------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/internal/reader/handler/handler.go b/internal/reader/handler/handler.go index 4c211790..1a70cdbd 100644 --- a/internal/reader/handler/handler.go +++ b/internal/reader/handler/handler.go @@ -244,7 +244,12 @@ func RefreshFeed(store *storage.Storage, userID, feedID int64, forceRefresh bool } if localizedError := responseHandler.LocalizedError(); localizedError != nil { - slog.Warn("Unable to fetch feed", slog.String("feed_url", originalFeed.FeedURL), slog.Any("error", localizedError.Error())) + slog.Warn("Unable to fetch feed", + slog.Int64("user_id", userID), + slog.Int64("feed_id", feedID), + slog.String("feed_url", originalFeed.FeedURL), + slog.Any("error", localizedError.Error()), + ) user, storeErr := store.UserByID(userID) if storeErr != nil { return locale.NewLocalizedErrorWrapper(storeErr, "error.database_error", storeErr) diff --git a/internal/worker/worker.go b/internal/worker/worker.go index 0ef0b01f..1fa77996 100644 --- a/internal/worker/worker.go +++ b/internal/worker/worker.go @@ -44,13 +44,5 @@ func (w *Worker) Run(c <-chan model.Job) { } metric.BackgroundFeedRefreshDuration.WithLabelValues(status).Observe(time.Since(startTime).Seconds()) } - - if localizedError != nil { - slog.Warn("Unable to refresh a feed", - slog.Int64("user_id", job.UserID), - slog.Int64("feed_id", job.FeedID), - slog.Any("error", localizedError.Error()), - ) - } } }