fix error handling

moofkit · May 30, 2024 · 12feed5 · 12feed5
1 parent b1feeb8
commit 12feed5
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/Gemfile b/Gemfile
@@ -11,5 +11,6 @@ gem "rake", "~> 13.0"
 gem "rspec", "~> 3.0"
 
 gem "rubocop", "~> 1.21"
+gem "rubocop-performance"
 gem "rubocop-rake"
 gem "rubocop-rspec"
diff --git a/lib/sidekiq/rescue/server_middleware.rb b/lib/sidekiq/rescue/server_middleware.rb
@@ -21,12 +21,13 @@ def call(job_instance, job_payload, _queue, &block)
       private
 
       def sidekiq_rescue(job_payload, job_class)
-        klasses_to_rescue = job_class.sidekiq_rescue_options.keys.flatten
         yield
-      rescue *klasses_to_rescue => e
-        error_group, options = job_class.sidekiq_rescue_options.to_a.find do |error_group, _options|
-          Array(error_group).include?(e.class)
+      rescue StandardError => e
+        error_group, options = job_class.sidekiq_rescue_options.reverse_each.find do |error_group, _options|
+          Array(error_group).any? { |error| e.is_a?(error) }
         end
+        raise e unless error_group
+
         rescue_error(e, error_group, options, job_payload)
       end