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 /app/services/subscribe_service.rb | |
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 'app/services/subscribe_service.rb')
-rw-r--r-- | app/services/subscribe_service.rb | 28 |
1 files changed, 22 insertions, 6 deletions
diff --git a/app/services/subscribe_service.rb b/app/services/subscribe_service.rb index 820b208e9..138718f14 100644 --- a/app/services/subscribe_service.rb +++ b/app/services/subscribe_service.rb @@ -5,15 +5,31 @@ class SubscribeService < BaseService account.secret = SecureRandom.hex subscription = account.subscription(api_subscription_url(account.id)) - response = subscription.subscribe + response = subscription.subscribe - unless response.successful? + if response_failed_permanently?(response) + # An error in the 4xx range (except for 429, which is rate limiting) + # means we're not allowed to subscribe. Fail and move on account.secret = '' - Rails.logger.debug "PuSH subscription request for #{account.acct} failed: #{response.message}" + account.save! + elsif response_successful?(response) + # Anything in the 2xx range means the subscription will be confirmed + # asynchronously, we've done what we needed to do + account.save! + else + # What's left is the 5xx range and 429, which means we need to retry + # at a later time. Fail loudly! + raise "Subscription attempt failed for #{account.acct} (#{account.hub_url}): HTTP #{response.code}" end + end + + private + + def response_failed_permanently?(response) + response.code > 299 && response.code < 500 && response.code != 429 + end - account.save! - rescue HTTP::Error, OpenSSL::SSL::SSLError - Rails.logger.debug "PuSH subscription request for #{account.acct} could not be made due to HTTP or SSL error" + def response_successful?(response) + response.code > 199 && response.code < 300 end end |