diff options
author | kibigo! <marrus-sh@users.noreply.github.com> | 2017-08-01 13:07:43 -0700 |
---|---|---|
committer | kibigo! <marrus-sh@users.noreply.github.com> | 2017-08-01 13:20:29 -0700 |
commit | 8150689b48716bb016d492d28cef08600a4b315e (patch) | |
tree | a05a2539e894c79ef17698dce0da5a6af0c25bf6 /app/workers/pubsubhubbub/subscribe_worker.rb | |
parent | b61e3daf983d87c6d2de7e54d420c2e8f5a531e6 (diff) | |
parent | 7ef848256871454a790a9b7cc725053c67ba3da4 (diff) |
Merge upstream (#111)
Diffstat (limited to 'app/workers/pubsubhubbub/subscribe_worker.rb')
-rw-r--r-- | app/workers/pubsubhubbub/subscribe_worker.rb | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/workers/pubsubhubbub/subscribe_worker.rb b/app/workers/pubsubhubbub/subscribe_worker.rb index 6865e7136..7560c2671 100644 --- a/app/workers/pubsubhubbub/subscribe_worker.rb +++ b/app/workers/pubsubhubbub/subscribe_worker.rb @@ -3,7 +3,7 @@ class Pubsubhubbub::SubscribeWorker include Sidekiq::Worker - sidekiq_options queue: 'push', retry: 10, unique: :until_executed + sidekiq_options queue: 'push', retry: 10, unique: :until_executed, dead: false sidekiq_retry_in do |count| case count @@ -18,9 +18,17 @@ class Pubsubhubbub::SubscribeWorker end end + sidekiq_retries_exhausted do |msg, _e| + account = Account.find(msg['args'].first) + logger.error "PuSH subscription attempts for #{account.acct} exhausted. Unsubscribing" + ::UnsubscribeService.new.call(account) + end + def perform(account_id) account = Account.find(account_id) logger.debug "PuSH re-subscribing to #{account.acct}" ::SubscribeService.new.call(account) + rescue => e + raise e.class, "Subscribe failed for #{account&.acct}: #{e.message}" end end |