cybrespace
/
mastodon
4
3
Fork 3
Code Issues 7 Pull Requests Releases Activity

Do no retry web push workers if the server returns a 4xx response (#9434) 

Add timeout of 10s to web push requests
This commit is contained in:
Eugen Rochko 2018-12-17 03:14:13 +01:00 committed by GitHub
parent 4297de34cf
commit 628da11e38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/web/push_subscription.rb
View File

@ -68,6 +68,9 @@ class Web::PushSubscription < ApplicationRecord
p256dh: key_p256dh, p256dh: key_p256dh,
auth: key_auth, auth: key_auth,
ttl: ttl, ttl: ttl,
ssl_timeout: 10,
open_timeout: 10,
read_timeout: 10,
vapid: { vapid: {
subject: "mailto:#{::Setting.site_contact_email}", subject: "mailto:#{::Setting.site_contact_email}",
private_key: Rails.configuration.x.vapid_private_key, private_key: Rails.configuration.x.vapid_private_key,

4
app/workers/web/push_notification_worker.rb
View File

@ -10,8 +10,8 @@ class Web::PushNotificationWorker
notification = Notification.find(notification_id) notification = Notification.find(notification_id)
subscription.push(notification) unless notification.activity.nil? subscription.push(notification) unless notification.activity.nil?
rescue Webpush::InvalidSubscription, Webpush::ExpiredSubscription rescue Webpush::ResponseError => e
subscription.destroy! subscription.destroy! if (400..499).cover?(e.response.code.to_i)
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
true true
end end