]> cat aescling's git repositories - mastodon.git/commitdiff
Remove PuSH subscriptions when delivery is answered with a 4xx error
authorEugen Rochko <eugen@zeonfederated.com>
Wed, 5 Apr 2017 00:32:18 +0000 (02:32 +0200)
committerEugen Rochko <eugen@zeonfederated.com>
Wed, 5 Apr 2017 00:34:33 +0000 (02:34 +0200)
app/workers/pubsubhubbub/delivery_worker.rb

index 15005bc80200a02a88edd32eefd719fad29d5458..466def3a85f2f7ba65544b97922cde79bb2fe2d3 100644 (file)
@@ -22,6 +22,7 @@ class Pubsubhubbub::DeliveryWorker
                    .headers(headers)
                    .post(subscription.callback_url, body: payload)
 
+    return subscription.destroy! if response.code > 299 && response.code < 500 && response.code != 429 # HTTP 4xx means error is not temporary, except for 429 (throttling)
     raise "Delivery failed for #{subscription.callback_url}: HTTP #{response.code}" unless response.code > 199 && response.code < 300
 
     subscription.touch(:last_successful_delivery_at)