From 0698c610a6270f2c184dd97534afb0359cd23994 Mon Sep 17 00:00:00 2001 From: unarist Date: Sun, 17 Sep 2017 01:18:00 +0900 Subject: Fix an error in ReplyDistributionWorker when replied status was deleted (#4974) Reply distribution is proceed by Sidekiq, so replied status may be deleted before this. --- app/workers/activitypub/reply_distribution_worker.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/workers/activitypub') diff --git a/app/workers/activitypub/reply_distribution_worker.rb b/app/workers/activitypub/reply_distribution_worker.rb index f9127340f..fe99fc05f 100644 --- a/app/workers/activitypub/reply_distribution_worker.rb +++ b/app/workers/activitypub/reply_distribution_worker.rb @@ -7,9 +7,9 @@ class ActivityPub::ReplyDistributionWorker def perform(status_id) @status = Status.find(status_id) - @account = @status.thread.account + @account = @status.thread&.account - return if skip_distribution? + return if @account.nil? || skip_distribution? ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url| [signed_payload, @status.account_id, inbox_url] -- cgit From a0bbeafb045441543f7bb9f959e7af184550f7d3 Mon Sep 17 00:00:00 2001 From: Daigo 3 Dango Date: Sat, 23 Sep 2017 23:14:06 -1000 Subject: Suppress backtrace when failed to communicate with a remote instance (#5076) --- app/workers/activitypub/delivery_worker.rb | 2 +- app/workers/pubsubhubbub/delivery_worker.rb | 2 +- app/workers/pubsubhubbub/subscribe_worker.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/workers/activitypub') diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb index cd67b6710..a4e829343 100644 --- a/app/workers/activitypub/delivery_worker.rb +++ b/app/workers/activitypub/delivery_worker.rb @@ -16,7 +16,7 @@ class ActivityPub::DeliveryWorker raise Mastodon::UnexpectedResponseError, @response unless response_successful? rescue => e - raise e.class, "Delivery failed for #{inbox_url}: #{e.message}" + raise e.class, "Delivery failed for #{inbox_url}: #{e.message}", e.backtrace[0] end private diff --git a/app/workers/pubsubhubbub/delivery_worker.rb b/app/workers/pubsubhubbub/delivery_worker.rb index 88645cf33..110b8bf16 100644 --- a/app/workers/pubsubhubbub/delivery_worker.rb +++ b/app/workers/pubsubhubbub/delivery_worker.rb @@ -17,7 +17,7 @@ class Pubsubhubbub::DeliveryWorker @payload = payload process_delivery unless blocked_domain? rescue => e - raise e.class, "Delivery failed for #{subscription&.callback_url}: #{e.message}" + raise e.class, "Delivery failed for #{subscription&.callback_url}: #{e.message}", e.backtrace[0] end private diff --git a/app/workers/pubsubhubbub/subscribe_worker.rb b/app/workers/pubsubhubbub/subscribe_worker.rb index 7560c2671..e350973e1 100644 --- a/app/workers/pubsubhubbub/subscribe_worker.rb +++ b/app/workers/pubsubhubbub/subscribe_worker.rb @@ -29,6 +29,6 @@ class Pubsubhubbub::SubscribeWorker logger.debug "PuSH re-subscribing to #{account.acct}" ::SubscribeService.new.call(account) rescue => e - raise e.class, "Subscribe failed for #{account&.acct}: #{e.message}" + raise e.class, "Subscribe failed for #{account&.acct}: #{e.message}", e.backtrace[0] end end -- cgit