aboutsummaryrefslogtreecommitdiff
path: root/internal/cli/refresh_feeds.go
diff options
context:
space:
mode:
Diffstat (limited to 'internal/cli/refresh_feeds.go')
-rw-r--r--internal/cli/refresh_feeds.go35
1 files changed, 28 insertions, 7 deletions
diff --git a/internal/cli/refresh_feeds.go b/internal/cli/refresh_feeds.go
index 0e90a6cf..d5b1edd3 100644
--- a/internal/cli/refresh_feeds.go
+++ b/internal/cli/refresh_feeds.go
@@ -4,11 +4,11 @@
package cli // import "miniflux.app/v2/internal/cli"
import (
+ "log/slog"
"sync"
"time"
"miniflux.app/v2/internal/config"
- "miniflux.app/v2/internal/logger"
"miniflux.app/v2/internal/model"
feedHandler "miniflux.app/v2/internal/reader/handler"
"miniflux.app/v2/internal/storage"
@@ -20,22 +20,39 @@ func refreshFeeds(store *storage.Storage) {
startTime := time.Now()
jobs, err := store.NewBatch(config.Opts.BatchSize())
if err != nil {
- logger.Error("[Cronjob] %v", err)
+ slog.Error("Unable to fetch jobs from database", slog.Any("error", err))
}
nbJobs := len(jobs)
- logger.Info("[Cronjob]] Created %d jobs from a batch size of %d", nbJobs, config.Opts.BatchSize())
+
+ slog.Info("Created a batch of feeds",
+ slog.Int("nb_jobs", nbJobs),
+ slog.Int("batch_size", config.Opts.BatchSize()),
+ )
+
var jobQueue = make(chan model.Job, nbJobs)
- logger.Info("[Cronjob] Starting a pool of %d workers", config.Opts.WorkerPoolSize())
+ slog.Info("Starting a pool of workers",
+ slog.Int("nb_workers", config.Opts.WorkerPoolSize()),
+ )
+
for i := 0; i < config.Opts.WorkerPoolSize(); i++ {
wg.Add(1)
go func(workerID int) {
defer wg.Done()
for job := range jobQueue {
- logger.Info("[Cronjob] Refreshing feed #%d for user #%d in worker #%d", job.FeedID, job.UserID, workerID)
+ slog.Info("Refreshing feed",
+ slog.Int64("feed_id", job.FeedID),
+ slog.Int64("user_id", job.UserID),
+ slog.Int("worker_id", workerID),
+ )
+
if err := feedHandler.RefreshFeed(store, job.UserID, job.FeedID, false); err != nil {
- logger.Error("[Cronjob] Refreshing the feed #%d returned this error: %v", job.FeedID, err)
+ slog.Error("Unable to refresh feed",
+ slog.Int64("feed_id", job.FeedID),
+ slog.Int64("user_id", job.UserID),
+ slog.Any("error", err),
+ )
}
}
}(i)
@@ -47,5 +64,9 @@ func refreshFeeds(store *storage.Storage) {
close(jobQueue)
wg.Wait()
- logger.Info("[Cronjob] Refreshed %d feed(s) in %s", nbJobs, time.Since(startTime))
+
+ slog.Info("Refreshed a batch of feeds",
+ slog.Int("nb_feeds", nbJobs),
+ slog.String("duration", time.Since(startTime).String()),
+ )
}