From 5bea42412e41b1121af04dbe6ef5c9bed22219b8 Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 8 May 2017 18:45:02 -0400 Subject: Services specs for subscribe and unsubscribe (#2928) * Add specs for unsubscribe service * Fix non existent methods in unsubscribe service * Clean up status handling in subscribe service --- app/services/subscribe_service.rb | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'app/services/subscribe_service.rb') diff --git a/app/services/subscribe_service.rb b/app/services/subscribe_service.rb index 138718f14..1e7984a7f 100644 --- a/app/services/subscribe_service.rb +++ b/app/services/subscribe_service.rb @@ -8,28 +8,28 @@ class SubscribeService < BaseService response = subscription.subscribe 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 + # We're not allowed to subscribe. Fail and move on. account.secret = '' 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 + # The subscription will be confirmed asynchronously. account.save! else - # What's left is the 5xx range and 429, which means we need to retry - # at a later time. Fail loudly! + # The response was either a 429 rate limit, or a 5xx error. + # 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 + # Any response in the 3xx or 4xx range, except for 429 (rate limit) def response_failed_permanently?(response) - response.code > 299 && response.code < 500 && response.code != 429 + (response.status.redirect? || response.status.client_error?) && !response.status.too_many_requests? end + # Any response in the 2xx range def response_successful?(response) - response.code > 199 && response.code < 300 + response.status.success? end end -- cgit