about summary refs log tree commit diff
path: root/lib
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-09-20 01:10:51 +0200
committerEugen Rochko <eugen@zeonfederated.com>2016-09-20 01:10:51 +0200
commit1cfc9aa20e2f4a9d7b6dcd5227246e1a5375ab31 (patch)
treef4bab1b150b71895ac842f4b957238888f1310b1 /lib
parent059ebbf48dc56971b88e26a15303a75643de8b98 (diff)
OStatus2 and Goldfinger gems now have timeouts for requests
Diffstat (limited to 'lib')
-rw-r--r--lib/tasks/mastodon.rake5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 5bc056a56..bdfa2e458 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -12,7 +12,11 @@ namespace :mastodon do
     desc 'Unsubscribes from PuSH updates of feeds nobody follows locally'
     task clear: :environment do
       Account.remote.without_followers.find_each do |a|
+        Rails.logger.debug "PuSH unsubscribing from #{a.acct}"
         a.subscription('').unsubscribe
+      rescue HTTP::Error, OpenSSL::SSL::SSLError
+        Rails.logger.debug "PuSH unsubscribing from #{a.acct} failed due to an HTTP or SSL error"
+      ensure
         a.update!(verify_token: '', secret: '', subscription_expires_at: nil)
       end
     end
@@ -20,6 +24,7 @@ namespace :mastodon do
     desc 'Re-subscribes to soon expiring PuSH subscriptions'
     task refresh: :environment do
       Account.expiring(1.day.from_now).find_each do |a|
+        Rails.logger.debug "PuSH re-subscribing to #{a.acct}"
         SubscribeService.new.(a)
       end
     end