Do no retry web push workers if the server returns a 4xx response (ma…

…stodon#9434) Add timeout of 10s to web push requests
ProjectMyosotis · Oct 2, 2019 · c8dbf2e · c8dbf2e
1 parent f8502c8
commit c8dbf2e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/models/web/push_subscription.rb b/app/models/web/push_subscription.rb
@@ -68,6 +68,9 @@ def push_payload(message, ttl = 5.minutes.seconds)
       p256dh: key_p256dh,
       auth: key_auth,
       ttl: ttl,
+      ssl_timeout: 10,
+      open_timeout: 10,
+      read_timeout: 10,
       vapid: {
         subject: "mailto:#{::Setting.site_contact_email}",
         private_key: Rails.configuration.x.vapid_private_key,

diff --git a/app/workers/web/push_notification_worker.rb b/app/workers/web/push_notification_worker.rb
@@ -10,8 +10,8 @@ def perform(subscription_id, notification_id)
     notification = Notification.find(notification_id)
 
     subscription.push(notification) unless notification.activity.nil?
-  rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription
-    subscription.destroy!
+  rescue Webpush::ResponseError => e
+    subscription.destroy! if (400..499).cover?(e.response.code.to_i)
   rescue ActiveRecord::RecordNotFound
     true
   end