From: Takeshi Umeda <noel.yoshiba@gmail.com>
Date: Thu, 16 Apr 2020 06:04:10 +0000 (+0900)
Subject: Fix DeliveryWorker not to call failure_tracker when inbox_url is unavailable (#13482)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=04c8d825f6a70b48216b7b78e59068931f9231b2;p=mastodon.git

Fix DeliveryWorker not to call failure_tracker when inbox_url is unavailable (#13482)
---

diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 0f925658f..14e37dc34 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -23,10 +23,12 @@ class ActivityPub::DeliveryWorker
 
     perform_request
   ensure
-    if @performed
-      failure_tracker.track_success!
-    else
-      failure_tracker.track_failure!
+    if @inbox_url.present?
+      if @performed
+        failure_tracker.track_success!
+      else
+        failure_tracker.track_failure!
+      end
     end
   end