about summary refs log tree commit diff
path: root/app/lib
diff options
context:
space:
mode:
authorClworld <clworld@ggtea.org>2017-07-27 07:38:20 +0900
committerEugen Rochko <eugen@zeonfederated.com>2017-07-27 00:38:20 +0200
commit994d948c3947b75140c2a2a7de5b81713c7b8ea3 (patch)
tree525360503ce6a7db4ac7b522c58d2de8046d8a97 /app/lib
parentf5e228ad2e2503d7cbe3da975e7d2b473e60712b (diff)
Add callback_url/acct information for Sidekiq PuSH workers Exception. (#4281)
* Add destination informations to exception on SubscribeWorker and DeliveryWorker.

* Simplify delivery error message.

* Prevent changing Exception type...

* fix typo.
Diffstat (limited to 'app/lib')
-rw-r--r--app/lib/exceptions.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/lib/exceptions.rb b/app/lib/exceptions.rb
index 34d84a34f..b2489711d 100644
--- a/app/lib/exceptions.rb
+++ b/app/lib/exceptions.rb
@@ -8,11 +8,11 @@ module Mastodon
 
   class UnexpectedResponseError < Error
     def initialize(response = nil)
-      @response = response
-    end
-
-    def to_s
-      "#{@response.uri} returned code #{@response.code}"
+      if response.respond_to? :uri
+        super("#{response.uri} returned code #{response.code}")
+      else
+        super
+      end
     end
   end
 end