diff options
| author |  Frédéric Guillot <fred@miniflux.net> | 2018-02-27 21:08:32 -0800 |
|---|---|---|
| committer | Frédéric Guillot <fred@miniflux.net> | 2018-02-27 21:08:32 -0800 |
| commit | 953d0a2dc05714c22f7c9c389a860fd38c07b66e (patch) | |
| tree | dbbbb0659ed8e69e02c9b977b63550d1192d6be2 /daemon | |
| parent | 9694861cb6ad08ded824b9bf04ef19a3a168d7b9 (diff) | |
Support localized feed errors generated by background workers
Diffstat (limited to 'daemon')
| -rw-r--r-- | daemon/daemon.go | 6 | ||||
| -rw-r--r-- | daemon/routes.go | 3 | ||||
| -rw-r--r-- | daemon/server.go | 5 |
3 files changed, 8 insertions, 6 deletions
diff --git a/daemon/daemon.go b/daemon/daemon.go index 9e1576d..f100159 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -12,6 +12,7 @@ import ( "time" "github.com/miniflux/miniflux/config" + "github.com/miniflux/miniflux/locale" "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/reader/feed" "github.com/miniflux/miniflux/scheduler" @@ -26,9 +27,10 @@ func Run(cfg *config.Config, store *storage.Storage) { signal.Notify(stop, os.Interrupt) signal.Notify(stop, syscall.SIGTERM) - feedHandler := feed.NewFeedHandler(store) + translator := locale.Load() + feedHandler := feed.NewFeedHandler(store, translator) pool := scheduler.NewWorkerPool(feedHandler, cfg.WorkerPoolSize()) - server := newServer(cfg, store, pool, feedHandler) + server := newServer(cfg, store, pool, feedHandler, translator) scheduler.NewFeedScheduler( store, diff --git a/daemon/routes.go b/daemon/routes.go index 35cec9e..bb141f7 100644 --- a/daemon/routes.go +++ b/daemon/routes.go @@ -23,9 +23,8 @@ import ( "github.com/gorilla/mux" ) -func routes(cfg *config.Config, store *storage.Storage, feedHandler *feed.Handler, pool *scheduler.WorkerPool) *mux.Router { +func routes(cfg *config.Config, store *storage.Storage, feedHandler *feed.Handler, pool *scheduler.WorkerPool, translator *locale.Translator) *mux.Router { router := mux.NewRouter() - translator := locale.Load() templateEngine := template.NewEngine(cfg, router, translator) apiController := api.NewController(store, feedHandler) diff --git a/daemon/server.go b/daemon/server.go index 4e8ff32..6ac49bd 100644 --- a/daemon/server.go +++ b/daemon/server.go @@ -10,6 +10,7 @@ import ( "time" "github.com/miniflux/miniflux/config" + "github.com/miniflux/miniflux/locale" "github.com/miniflux/miniflux/logger" "github.com/miniflux/miniflux/reader/feed" "github.com/miniflux/miniflux/scheduler" @@ -18,7 +19,7 @@ import ( "golang.org/x/crypto/acme/autocert" ) -func newServer(cfg *config.Config, store *storage.Storage, pool *scheduler.WorkerPool, feedHandler *feed.Handler) *http.Server { +func newServer(cfg *config.Config, store *storage.Storage, pool *scheduler.WorkerPool, feedHandler *feed.Handler, translator *locale.Translator) *http.Server { certFile := cfg.CertFile() keyFile := cfg.KeyFile() certDomain := cfg.CertDomain() @@ -28,7 +29,7 @@ func newServer(cfg *config.Config, store *storage.Storage, pool *scheduler.Worke WriteTimeout: 10 * time.Second, IdleTimeout: 60 * time.Second, Addr: cfg.ListenAddr(), - Handler: routes(cfg, store, feedHandler, pool), + Handler: routes(cfg, store, feedHandler, pool, translator), } if certDomain != "" && certCache != "" { |