Browse Source

refactor: avoid logging twice the feed errors in the background worker

Frédéric Guillot 1 year ago
parent
commit
0af1a6e121
2 changed files with 6 additions and 9 deletions
  1. 6 1
      internal/reader/handler/handler.go
  2. 0 8
      internal/worker/worker.go

+ 6 - 1
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)

+ 0 - 8
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()),
-			)
-		}
 	}
 }