From e9ecbca70d28c775a9eeda7670e06443a1037d5b Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Sun, 10 May 2020 10:30:27 +0200
Subject: [PATCH] Fix error within error when limiting backtrace to 3 lines
(#13120)
Fix #13086, close #13113
---
app/lib/request.rb | 2 --
app/lib/sidekiq_error_handler.rb | 11 +++++++++++
app/workers/activitypub/delivery_worker.rb | 10 +++-------
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/app/lib/request.rb b/app/lib/request.rb
index c476e7785b..247c32958a 100644
--- a/app/lib/request.rb
+++ b/app/lib/request.rb
@@ -73,8 +73,6 @@ class Request
response.body_with_limit if http_client.persistent?
yield response if block_given?
- rescue => e
- raise e.class, e.message, e.backtrace[0]
ensure
http_client.close unless http_client.persistent?
end
diff --git a/app/lib/sidekiq_error_handler.rb b/app/lib/sidekiq_error_handler.rb
index 8eb6b942db..b07817d455 100644
--- a/app/lib/sidekiq_error_handler.rb
+++ b/app/lib/sidekiq_error_handler.rb
@@ -1,13 +1,24 @@
# frozen_string_literal: true
class SidekiqErrorHandler
+ BACKTRACE_LIMIT = 3
+
def call(*)
yield
rescue Mastodon::HostValidationError
# Do not retry
+ rescue => e
+ limit_backtrace_and_raise(e)
ensure
socket = Thread.current[:statsd_socket]
socket&.close
Thread.current[:statsd_socket] = nil
end
+
+ private
+
+ def limit_backtrace_and_raise(e)
+ e.set_backtrace(e.backtrace.first(BACKTRACE_LIMIT))
+ raise e
+ end
end
diff --git a/app/workers/activitypub/delivery_worker.rb b/app/workers/activitypub/delivery_worker.rb
index 14e37dc34a..60775787a8 100644
--- a/app/workers/activitypub/delivery_worker.rb
+++ b/app/workers/activitypub/delivery_worker.rb
@@ -52,13 +52,9 @@ class ActivityPub::DeliveryWorker
end
end
- begin
- light.with_threshold(STOPLIGHT_FAILURE_THRESHOLD)
- .with_cool_off_time(STOPLIGHT_COOLDOWN)
- .run
- rescue Stoplight::Error::RedLight => e
- raise e.class, e.message, e.backtrace.first(3)
- end
+ light.with_threshold(STOPLIGHT_FAILURE_THRESHOLD)
+ .with_cool_off_time(STOPLIGHT_COOLDOWN)
+ .run
end
def failure_tracker
--
GitLab