diff --git a/locale/translations.go b/locale/translations.go index c2049f74..a15c0446 100644 --- a/locale/translations.go +++ b/locale/translations.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-11-21 20:44:27.919123936 -0800 PST m=+0.030076732 +// 2017-11-21 22:32:06.371264138 -0800 PST m=+0.036637447 package locale @@ -144,12 +144,13 @@ var Translations = map[string]string{ "Bookmarklet": "Bookmarklet", "Drag and drop this link to your bookmarks.": "Glisser-déposer ce lien dans vos favoris.", "This special link allows you to subscribe to a website directly by using a bookmark in your web browser.": "Ce lien spécial vous permet de vous abonner à un site web directement en utilisant un marque page dans votre navigateur web.", - "Add to Miniflux": "Ajouter à Miniflux" + "Add to Miniflux": "Ajouter à Miniflux", + "Refresh all feeds in the background": "Actualiser tous les abonnements en arrière-plan" } `, } var TranslationsChecksums = map[string]string{ "en_US": "6fe95384260941e8a5a3c695a655a932e0a8a6a572c1e45cb2b1ae8baa01b897", - "fr_FR": "f1ddbcfb8ffd837a2df69e8506d023e4254ead2f0b94e518ab595df97d32c87a", + "fr_FR": "9a57dded2cf33b8c4d9a9d90dcbf18c96026ca396f409eb1a776ddc206fe0198", } diff --git a/locale/translations/fr_FR.json b/locale/translations/fr_FR.json index a0206bad..3cef2a59 100644 --- a/locale/translations/fr_FR.json +++ b/locale/translations/fr_FR.json @@ -128,5 +128,6 @@ "Bookmarklet": "Bookmarklet", "Drag and drop this link to your bookmarks.": "Glisser-déposer ce lien dans vos favoris.", "This special link allows you to subscribe to a website directly by using a bookmark in your web browser.": "Ce lien spécial vous permet de vous abonner à un site web directement en utilisant un marque page dans votre navigateur web.", - "Add to Miniflux": "Ajouter à Miniflux" + "Add to Miniflux": "Ajouter à Miniflux", + "Refresh all feeds in the background": "Actualiser tous les abonnements en arrière-plan" } diff --git a/main.go b/main.go index 9ab7cdc4..4393472c 100644 --- a/main.go +++ b/main.go @@ -44,21 +44,15 @@ func run(cfg *config.Config, store *storage.Storage) { signal.Notify(stop, os.Interrupt) feedHandler := feed.NewFeedHandler(store) - server := server.NewServer(cfg, store, feedHandler) + pool := scheduler.NewWorkerPool(feedHandler, cfg.GetInt("WORKER_POOL_SIZE", config.DefaultWorkerPoolSize)) + server := server.NewServer(cfg, store, pool, feedHandler) - go func() { - pool := scheduler.NewWorkerPool( - feedHandler, - cfg.GetInt("WORKER_POOL_SIZE", config.DefaultWorkerPoolSize), - ) - - scheduler.NewScheduler( - store, - pool, - cfg.GetInt("POLLING_FREQUENCY", config.DefaultPollingFrequency), - cfg.GetInt("BATCH_SIZE", config.DefaultBatchSize), - ) - }() + scheduler.NewScheduler( + store, + pool, + cfg.GetInt("POLLING_FREQUENCY", config.DefaultPollingFrequency), + cfg.GetInt("BATCH_SIZE", config.DefaultBatchSize), + ) <-stop log.Println("Shutting down the server...") diff --git a/model/job.go b/model/job.go index ed3ef5ee..9f9167bc 100644 --- a/model/job.go +++ b/model/job.go @@ -4,7 +4,11 @@ package model +// Job represents a payload sent to the processing queue. type Job struct { UserID int64 FeedID int64 } + +// JobList represents a list of jobs. +type JobList []Job diff --git a/scheduler/scheduler.go b/scheduler/scheduler.go index ab87e992..acfb4016 100644 --- a/scheduler/scheduler.go +++ b/scheduler/scheduler.go @@ -5,20 +5,24 @@ package scheduler import ( - "github.com/miniflux/miniflux2/storage" "log" "time" + + "github.com/miniflux/miniflux2/storage" ) -// NewScheduler starts a new scheduler to push jobs to a pool of workers. +// NewScheduler starts a new scheduler that push jobs to a pool of workers. func NewScheduler(store *storage.Storage, workerPool *WorkerPool, frequency, batchSize int) { - c := time.Tick(time.Duration(frequency) * time.Minute) - for now := range c { - jobs := store.GetJobs(batchSize) - log.Printf("[Scheduler:%v] => Pushing %d jobs\n", now, len(jobs)) - - for _, job := range jobs { - workerPool.Push(job) + go func() { + c := time.Tick(time.Duration(frequency) * time.Minute) + for now := range c { + jobs, err := store.NewBatch(batchSize) + if err != nil { + log.Println("[Scheduler]", err) + } else { + log.Printf("[Scheduler:%v] => Pushing %d jobs\n", now, len(jobs)) + workerPool.Push(jobs) + } } - } + }() } diff --git a/scheduler/worker_pool.go b/scheduler/worker_pool.go index b753f893..c4a83723 100644 --- a/scheduler/worker_pool.go +++ b/scheduler/worker_pool.go @@ -14,9 +14,11 @@ type WorkerPool struct { queue chan model.Job } -// Push send a job on the queue. -func (w *WorkerPool) Push(job model.Job) { - w.queue <- job +// Push send a list of jobs to the queue. +func (w *WorkerPool) Push(jobs model.JobList) { + for _, job := range jobs { + w.queue <- job + } } // NewWorkerPool creates a pool of background workers. diff --git a/server/routes.go b/server/routes.go index 97a8b2f9..4d4a99a6 100644 --- a/server/routes.go +++ b/server/routes.go @@ -7,6 +7,8 @@ package server import ( "net/http" + "github.com/miniflux/miniflux2/scheduler" + "github.com/miniflux/miniflux2/config" "github.com/miniflux/miniflux2/locale" "github.com/miniflux/miniflux2/reader/feed" @@ -21,13 +23,13 @@ import ( "github.com/gorilla/mux" ) -func getRoutes(cfg *config.Config, store *storage.Storage, feedHandler *feed.Handler) *mux.Router { +func getRoutes(cfg *config.Config, store *storage.Storage, feedHandler *feed.Handler, pool *scheduler.WorkerPool) *mux.Router { router := mux.NewRouter() translator := locale.Load() templateEngine := template.NewEngine(cfg, router, translator) apiController := api_controller.NewController(store, feedHandler) - uiController := ui_controller.NewController(store, feedHandler, opml.NewHandler(store)) + uiController := ui_controller.NewController(store, pool, feedHandler, opml.NewHandler(store)) apiHandler := core.NewHandler(store, router, templateEngine, translator, middleware.NewMiddlewareChain( middleware.NewBasicAuthMiddleware(store).Handler, @@ -79,6 +81,7 @@ func getRoutes(cfg *config.Config, store *storage.Storage, feedHandler *feed.Han router.Handle("/feed/{feedID}/update", uiHandler.Use(uiController.UpdateFeed)).Name("updateFeed").Methods("POST") router.Handle("/feed/{feedID}/entries", uiHandler.Use(uiController.ShowFeedEntries)).Name("feedEntries").Methods("GET") router.Handle("/feeds", uiHandler.Use(uiController.ShowFeedsPage)).Name("feeds").Methods("GET") + router.Handle("/feeds/refresh", uiHandler.Use(uiController.RefreshAllFeeds)).Name("refreshAllFeeds").Methods("GET") router.Handle("/unread/entry/{entryID}", uiHandler.Use(uiController.ShowUnreadEntry)).Name("unreadEntry").Methods("GET") router.Handle("/history/entry/{entryID}", uiHandler.Use(uiController.ShowReadEntry)).Name("readEntry").Methods("GET") diff --git a/server/server.go b/server/server.go index 61b62291..f1a2a577 100644 --- a/server/server.go +++ b/server/server.go @@ -9,19 +9,21 @@ import ( "net/http" "time" + "github.com/miniflux/miniflux2/scheduler" + "github.com/miniflux/miniflux2/config" "github.com/miniflux/miniflux2/reader/feed" "github.com/miniflux/miniflux2/storage" ) // NewServer returns a new HTTP server. -func NewServer(cfg *config.Config, store *storage.Storage, feedHandler *feed.Handler) *http.Server { +func NewServer(cfg *config.Config, store *storage.Storage, pool *scheduler.WorkerPool, feedHandler *feed.Handler) *http.Server { server := &http.Server{ ReadTimeout: 5 * time.Second, WriteTimeout: 10 * time.Second, IdleTimeout: 60 * time.Second, Addr: cfg.Get("LISTEN_ADDR", config.DefaultListenAddr), - Handler: getRoutes(cfg, store, feedHandler), + Handler: getRoutes(cfg, store, feedHandler, pool), } go func() { diff --git a/server/static/bin.go b/server/static/bin.go index 7a587113..0132a9c3 100644 --- a/server/static/bin.go +++ b/server/static/bin.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-11-21 20:44:27.896797236 -0800 PST m=+0.007750032 +// 2017-11-21 22:32:06.342731949 -0800 PST m=+0.008105258 package static diff --git a/server/static/css.go b/server/static/css.go index 8554c22d..42a1cbab 100644 --- a/server/static/css.go +++ b/server/static/css.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-11-21 20:44:27.899481906 -0800 PST m=+0.010434702 +// 2017-11-21 22:32:06.344826414 -0800 PST m=+0.010199723 package static diff --git a/server/static/js.go b/server/static/js.go index 45f51be4..04a3f422 100644 --- a/server/static/js.go +++ b/server/static/js.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-11-21 20:44:27.901252396 -0800 PST m=+0.012205192 +// 2017-11-21 22:32:06.347626921 -0800 PST m=+0.013000230 package static diff --git a/server/template/common.go b/server/template/common.go index 5aee57f6..ce54011e 100644 --- a/server/template/common.go +++ b/server/template/common.go @@ -1,5 +1,5 @@ // Code generated by go generate; DO NOT EDIT. -// 2017-11-21 20:44:27.917425704 -0800 PST m=+0.028378500 +// 2017-11-21 22:32:06.368574596 -0800 PST m=+0.033947905 package template diff --git a/server/template/html/feeds.html b/server/template/html/feeds.html index 778f64f4..f84e59f4 100644 --- a/server/template/html/feeds.html +++ b/server/template/html/feeds.html @@ -13,6 +13,9 @@