sidekiq-rescue 0.3.0 → 0.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +7 -1
- data/lib/sidekiq/rescue/dsl.rb +8 -3
- data/lib/sidekiq/rescue/rspec/matchers.rb +1 -1
- data/lib/sidekiq/rescue/server_middleware.rb +1 -3
- data/lib/sidekiq/rescue/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f373ccbd6c038182766f55cd0d2091eb3052c2a008827b223aa9293728d41268
|
|
4
|
+
data.tar.gz: d6b8c96d73cb0690446be1b8330eda3f805a63f386d1778d5a1682d70e379037
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 967dd0e178742e6dd1df06f0e5382d2a07d889a18007db15c7202f2725954c29916a866b182b1823e35fe24ad5252df791201e26045c456272ac74b36f1c82c8
|
|
7
|
+
data.tar.gz: 6ce5d97588e78c3cf1bd49e462a9af742bd7afa2fc25a5b6e798adc67a182e0d2236b8c24471d729de757a7cbb25d8544d7baac3e69d5fb01dec164fb72c34a8
|
data/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
## [Unreleased]
|
|
2
2
|
|
|
3
|
+
## [0.3.1] - 2024-05-30
|
|
4
|
+
|
|
5
|
+
- Fix bug with inheritance of DSL options
|
|
6
|
+
|
|
3
7
|
## [0.3.0] - 2024-05-30
|
|
4
8
|
|
|
5
9
|
- Fix issue with RSpec matcher when job is not rescueable
|
|
@@ -26,7 +30,9 @@
|
|
|
26
30
|
- Add documentation
|
|
27
31
|
- Add CI
|
|
28
32
|
|
|
29
|
-
[Unreleased]: https://github.com/moofkit/sidekiq-rescue/compare/v0.
|
|
33
|
+
[Unreleased]: https://github.com/moofkit/sidekiq-rescue/compare/v0.3.1...HEAD
|
|
34
|
+
[0.3.1]: https://github.com/moofkit/sidekiq-rescue/releases/tag/v0.3.1
|
|
35
|
+
[0.3.0]: https://github.com/moofkit/sidekiq-rescue/releases/tag/v0.3.0
|
|
30
36
|
[0.2.1]: https://github.com/moofkit/sidekiq-rescue/releases/tag/v0.2.1
|
|
31
37
|
[0.2.0]: https://github.com/moofkit/sidekiq-rescue/releases/tag/v0.2.0
|
|
32
38
|
[0.1.0]: https://github.com/moofkit/sidekiq-rescue/releases/tag/v0.1.0
|
data/lib/sidekiq/rescue/dsl.rb
CHANGED
|
@@ -31,8 +31,13 @@ module Sidekiq
|
|
|
31
31
|
assign_sidekiq_rescue_options(unpacked_errors, delay, limit)
|
|
32
32
|
end
|
|
33
33
|
|
|
34
|
-
|
|
35
|
-
|
|
34
|
+
# Find the error group and options for the given exception.
|
|
35
|
+
# @param exception [StandardError] The exception to find the error group for.
|
|
36
|
+
# @return [Array<StandardError>, Hash] The error group and options.
|
|
37
|
+
def sidekiq_rescue_error_group_with_options_by(exception)
|
|
38
|
+
sidekiq_rescue_options.reverse_each.find do |error_group, _options|
|
|
39
|
+
Array(error_group).any? { |error_klass| exception.is_a?(error_klass) }
|
|
40
|
+
end
|
|
36
41
|
end
|
|
37
42
|
|
|
38
43
|
private
|
|
@@ -65,7 +70,7 @@ module Sidekiq
|
|
|
65
70
|
|
|
66
71
|
def assign_sidekiq_rescue_options(errors, delay, limit)
|
|
67
72
|
self.sidekiq_rescue_options ||= {}
|
|
68
|
-
self.sidekiq_rescue_options.merge
|
|
73
|
+
self.sidekiq_rescue_options = self.sidekiq_rescue_options.merge(errors => { delay: delay, limit: limit })
|
|
69
74
|
end
|
|
70
75
|
end
|
|
71
76
|
end
|
|
@@ -35,7 +35,7 @@ module Sidekiq
|
|
|
35
35
|
|
|
36
36
|
return false unless matched
|
|
37
37
|
|
|
38
|
-
options = actual.
|
|
38
|
+
_error_group, options = actual.sidekiq_rescue_error_group_with_options_by(expected.new)
|
|
39
39
|
|
|
40
40
|
(@delay.nil? || options.fetch(:delay) == @delay) &&
|
|
41
41
|
(@limit.nil? || options.fetch(:limit) == @limit)
|
|
@@ -23,9 +23,7 @@ module Sidekiq
|
|
|
23
23
|
def sidekiq_rescue(job_payload, job_class)
|
|
24
24
|
yield
|
|
25
25
|
rescue StandardError => e
|
|
26
|
-
error_group, options = job_class.
|
|
27
|
-
Array(error_group).any? { |error| e.is_a?(error) }
|
|
28
|
-
end
|
|
26
|
+
error_group, options = job_class.sidekiq_rescue_error_group_with_options_by(e)
|
|
29
27
|
raise e unless error_group
|
|
30
28
|
|
|
31
29
|
rescue_error(e, error_group, options, job_payload)
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: sidekiq-rescue
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.3.
|
|
4
|
+
version: 0.3.1
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Dmitrii Ivliev
|
|
@@ -50,7 +50,7 @@ metadata:
|
|
|
50
50
|
homepage_uri: https://github.com/moofkit/sidekiq-rescue
|
|
51
51
|
source_code_uri: https://github.com/moofkit/sidekiq-rescue
|
|
52
52
|
changelog_uri: https://github.com/moofkit/sidekiq-rescue/blob/master/CHANGELOG.md
|
|
53
|
-
documentation_uri: https://rubydoc.info/gems/sidekiq-rescue/0.3.
|
|
53
|
+
documentation_uri: https://rubydoc.info/gems/sidekiq-rescue/0.3.1
|
|
54
54
|
rubygems_mfa_required: 'true'
|
|
55
55
|
post_install_message:
|
|
56
56
|
rdoc_options: []
|