diff options
| author | Eugen Rochko <eugen@zeonfederated.com> | 2017-05-05 02:23:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-05 02:23:01 +0200 |
| commit | 81584779cb1795d2fe7827e054bbe245712528a2 (patch) | |
| tree | 008186fee04307d50db7a2dc3fa50696488ed686 /config | |
| parent | 61c33652ad7a98f0c30fea67bc382e1306b69880 (diff) | |
More robust PuSH subscription refreshes (#2799)
* Fix #2473 - Use sidekiq scheduler to refresh PuSH subscriptions instead of cron Fix an issue where / in domain would raise exception in TagManager#normalize_domain PuSH subscriptions refresh done in a round-robin way to avoid hammering a single server's hub in sequence. Correct handling of failures/retries through Sidekiq (see also #2613). Optimize Account#with_followers scope. Also, since subscriptions are now delegated to Sidekiq jobs, an uncaught exception will not stop the entire refreshing operation halfway through Fix #2702 - Correct user agent header on outgoing http requests * Add test for SubscribeService * Extract #expiring_accounts into method * Make mastodon:push:refresh no-op * Queues are now defined in sidekiq.yml * Queues are now in sidekiq.yml
Diffstat (limited to 'config')
| -rw-r--r-- | config/environments/development.rb | 3 | ||||
| -rw-r--r-- | config/sidekiq.yml | 9 |
2 files changed, 9 insertions, 3 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb index 58e8a0728..c20d08493 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -69,7 +69,4 @@ Rails.application.configure do end end -require 'sidekiq/testing' -Sidekiq::Testing.inline! - ActiveRecordQueryTrace.enabled = ENV.fetch('QUERY_TRACE_ENABLED') { false } diff --git a/config/sidekiq.yml b/config/sidekiq.yml index ee32b6317..5c700cb27 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -1,2 +1,11 @@ --- :concurrency: 5 +:queues: + - default + - push + - pull + - mailers +:schedule: + subscriptions_scheduler: + cron: '0 5 * * *' + class: Scheduler::SubscriptionsScheduler |