Fix URLs appearing twice in errors of ActivityPub::DeliveryWorker

app/lib/request.rb

@@ -52,7 +52,7 @@ def perform
     begin
       response = http_client.headers(headers).public_send(@verb, @url.to_s, @options)
     rescue => e
-      raise e.class, "#{e.message} on #{@url}", e.backtrace[0]
+      raise e.class, "#{e.message} on #{@url}", e.backtrace
     end
 
     begin

app/workers/activitypub/delivery_worker.rb

@@ -17,13 +17,15 @@ def perform(json, source_account_id, inbox_url, options = {})
     @json           = json
     @source_account = Account.find(source_account_id)
     @inbox_url      = inbox_url
+    @performed      = false
 
     perform_request
-
-    failure_tracker.track_success!
-  rescue => e
-    failure_tracker.track_failure!
-    raise e.class, "Delivery failed for #{inbox_url}: #{e.message}", e.backtrace[0]
+  ensure
+    if @performed
+      failure_tracker.track_success!
+    else
+      failure_tracker.track_failure!
+    end
   end
 
   private
@@ -38,6 +40,8 @@ def perform_request
     light = Stoplight(@inbox_url) do
       build_request.perform do |response|
         raise Mastodon::UnexpectedResponseError, response unless response_successful?(response) || response_error_unsalvageable?(response)
+
+        @performed = true
       end
     end