sidekiq-unique-jobs 8.0.5 → 8.0.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +83 -5
- data/README.md +1 -3
- data/lib/sidekiq_unique_jobs/batch_delete.rb +1 -1
- data/lib/sidekiq_unique_jobs/changelog.rb +1 -1
- data/lib/sidekiq_unique_jobs/config.rb +4 -4
- data/lib/sidekiq_unique_jobs/constants.rb +1 -0
- data/lib/sidekiq_unique_jobs/job.rb +4 -4
- data/lib/sidekiq_unique_jobs/lock/base_lock.rb +1 -1
- data/lib/sidekiq_unique_jobs/lock/while_executing.rb +2 -0
- data/lib/sidekiq_unique_jobs/lock.rb +13 -10
- data/lib/sidekiq_unique_jobs/locksmith.rb +3 -3
- data/lib/sidekiq_unique_jobs/lua/unlock.lua +16 -9
- data/lib/sidekiq_unique_jobs/middleware/client.rb +1 -1
- data/lib/sidekiq_unique_jobs/middleware/server.rb +1 -1
- data/lib/sidekiq_unique_jobs/middleware.rb +5 -5
- data/lib/sidekiq_unique_jobs/orphans/manager.rb +6 -5
- data/lib/sidekiq_unique_jobs/orphans/reaper.rb +2 -1
- data/lib/sidekiq_unique_jobs/orphans/ruby_reaper.rb +26 -7
- data/lib/sidekiq_unique_jobs/redis/sorted_set.rb +8 -0
- data/lib/sidekiq_unique_jobs/script/caller.rb +1 -1
- data/lib/sidekiq_unique_jobs/script/client.rb +94 -0
- data/lib/sidekiq_unique_jobs/script/config.rb +68 -0
- data/lib/sidekiq_unique_jobs/script/dsl.rb +60 -0
- data/lib/sidekiq_unique_jobs/script/logging.rb +95 -0
- data/lib/sidekiq_unique_jobs/script/lua_error.rb +96 -0
- data/lib/sidekiq_unique_jobs/script/script.rb +75 -0
- data/lib/sidekiq_unique_jobs/script/scripts.rb +123 -0
- data/lib/sidekiq_unique_jobs/script/template.rb +41 -0
- data/lib/sidekiq_unique_jobs/script/timing.rb +35 -0
- data/lib/sidekiq_unique_jobs/script.rb +32 -1
- data/lib/sidekiq_unique_jobs/server.rb +2 -0
- data/lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb +13 -35
- data/lib/sidekiq_unique_jobs/sidekiq_unique_jobs.rb +4 -4
- data/lib/sidekiq_unique_jobs/sidekiq_worker_methods.rb +3 -3
- data/lib/sidekiq_unique_jobs/testing.rb +4 -4
- data/lib/sidekiq_unique_jobs/version.rb +1 -1
- data/lib/sidekiq_unique_jobs/web/helpers.rb +3 -3
- data/lib/sidekiq_unique_jobs/web/views/changelogs.erb +1 -1
- data/lib/sidekiq_unique_jobs/web/views/lock.erb +2 -2
- data/lib/sidekiq_unique_jobs/web/views/locks.erb +1 -1
- data/lib/sidekiq_unique_jobs/web.rb +18 -17
- data/lib/sidekiq_unique_jobs.rb +5 -4
- metadata +12 -23
@@ -68,46 +68,24 @@ module Sidekiq
|
|
68
68
|
prepend UniqueExtension
|
69
69
|
end
|
70
70
|
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
71
|
+
# See Sidekiq::Api
|
72
|
+
class JobRecord
|
73
|
+
#
|
74
|
+
# Provides extensions for unlocking jobs that are removed and deleted
|
75
|
+
#
|
76
|
+
# @author Mikael Henriksson <mikael@mhenrixon.com>
|
77
|
+
#
|
78
|
+
module UniqueExtension
|
76
79
|
#
|
77
|
-
#
|
80
|
+
# Wraps the original method to ensure locks for the job are deleted
|
78
81
|
#
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
#
|
83
|
-
def delete
|
84
|
-
SidekiqUniqueJobs::Unlockable.delete!(item)
|
85
|
-
super
|
86
|
-
end
|
82
|
+
def delete
|
83
|
+
SidekiqUniqueJobs::Unlockable.delete!(item)
|
84
|
+
super
|
87
85
|
end
|
88
|
-
|
89
|
-
prepend UniqueExtension
|
90
86
|
end
|
91
|
-
else
|
92
|
-
# See Sidekiq::Api
|
93
|
-
class Job
|
94
|
-
#
|
95
|
-
# Provides extensions for unlocking jobs that are removed and deleted
|
96
|
-
#
|
97
|
-
# @author Mikael Henriksson <mikael@mhenrixon.com>
|
98
|
-
#
|
99
|
-
module UniqueExtension
|
100
|
-
#
|
101
|
-
# Wraps the original method to ensure locks for the job are deleted
|
102
|
-
#
|
103
|
-
def delete
|
104
|
-
SidekiqUniqueJobs::Unlockable.delete!(item)
|
105
|
-
super
|
106
|
-
end
|
107
|
-
end
|
108
87
|
|
109
|
-
|
110
|
-
end
|
88
|
+
prepend UniqueExtension
|
111
89
|
end
|
112
90
|
|
113
91
|
# See Sidekiq::Api
|
@@ -186,7 +186,7 @@ module SidekiqUniqueJobs # rubocop:disable Metrics/ModuleLength
|
|
186
186
|
yield config
|
187
187
|
else
|
188
188
|
options.each do |key, val|
|
189
|
-
config.send("#{key}=", val)
|
189
|
+
config.send(:"#{key}=", val)
|
190
190
|
end
|
191
191
|
end
|
192
192
|
end
|
@@ -250,9 +250,9 @@ module SidekiqUniqueJobs # rubocop:disable Metrics/ModuleLength
|
|
250
250
|
# Attempt to constantize a string worker_class argument, always
|
251
251
|
# failing back to the original argument when the constant can't be found
|
252
252
|
#
|
253
|
-
# @return [Sidekiq::
|
253
|
+
# @return [Sidekiq::Job]
|
254
254
|
def constantize(str)
|
255
|
-
return str.class if str.is_a?(Sidekiq::
|
255
|
+
return str.class if str.is_a?(Sidekiq::Job) # sidekiq v6.x
|
256
256
|
return str unless str.is_a?(String)
|
257
257
|
return Object.const_get(str) unless str.include?("::")
|
258
258
|
|
@@ -269,7 +269,7 @@ module SidekiqUniqueJobs # rubocop:disable Metrics/ModuleLength
|
|
269
269
|
# Attempt to constantize a string worker_class argument, always
|
270
270
|
# failing back to the original argument when the constant can't be found
|
271
271
|
#
|
272
|
-
# @return [Sidekiq::
|
272
|
+
# @return [Sidekiq::Job, String]
|
273
273
|
def safe_constantize(str)
|
274
274
|
constantize(str)
|
275
275
|
rescue NameError => ex
|
@@ -1,13 +1,13 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
3
|
module SidekiqUniqueJobs
|
4
|
-
# Module with convenience methods for the Sidekiq::
|
4
|
+
# Module with convenience methods for the Sidekiq::Job class
|
5
5
|
#
|
6
6
|
# @author Mikael Henriksson <mikael@mhenrixon.com>
|
7
7
|
module SidekiqWorkerMethods
|
8
8
|
#
|
9
9
|
# @!attribute [r] job_class
|
10
|
-
# @return [Sidekiq::
|
10
|
+
# @return [Sidekiq::Job] The Sidekiq::Job implementation
|
11
11
|
attr_reader :job_class
|
12
12
|
|
13
13
|
# Avoids duplicating worker_class.respond_to? in multiple places
|
@@ -62,7 +62,7 @@ module SidekiqUniqueJobs
|
|
62
62
|
# Attempt to constantize a string worker_class argument, always
|
63
63
|
# failing back to the original argument when the constant can't be found
|
64
64
|
#
|
65
|
-
# @return [Sidekiq::
|
65
|
+
# @return [Sidekiq::Job]
|
66
66
|
def job_class_constantize(klazz = @job_class)
|
67
67
|
SidekiqUniqueJobs.safe_constantize(klazz)
|
68
68
|
end
|
@@ -42,11 +42,11 @@ module Sidekiq
|
|
42
42
|
end
|
43
43
|
|
44
44
|
#
|
45
|
-
# See Sidekiq::
|
45
|
+
# See Sidekiq::Job in Sidekiq gem for more details
|
46
46
|
#
|
47
47
|
module Worker
|
48
48
|
#
|
49
|
-
# Adds class methods to Sidekiq::
|
49
|
+
# Adds class methods to Sidekiq::Job
|
50
50
|
#
|
51
51
|
module ClassMethods
|
52
52
|
#
|
@@ -110,14 +110,14 @@ module Sidekiq
|
|
110
110
|
prepend Overrides
|
111
111
|
|
112
112
|
#
|
113
|
-
# Prepends methods to Sidekiq::
|
113
|
+
# Prepends methods to Sidekiq::Job
|
114
114
|
#
|
115
115
|
module ClassMethods
|
116
116
|
prepend Overrides::ClassMethods
|
117
117
|
end
|
118
118
|
|
119
119
|
#
|
120
|
-
# Prepends singleton methods to Sidekiq::
|
120
|
+
# Prepends singleton methods to Sidekiq::Job
|
121
121
|
#
|
122
122
|
module SignletonOverrides
|
123
123
|
#
|
@@ -133,7 +133,7 @@ module SidekiqUniqueJobs
|
|
133
133
|
#
|
134
134
|
# @return [String] a html safe string with relative time information
|
135
135
|
#
|
136
|
-
def
|
136
|
+
def _relative_time(time)
|
137
137
|
stamp = time.getutc.iso8601
|
138
138
|
%(<time class="ltr" dir="ltr" title="#{stamp}" datetime="#{stamp}">#{time}</time>)
|
139
139
|
end
|
@@ -145,12 +145,12 @@ module SidekiqUniqueJobs
|
|
145
145
|
#
|
146
146
|
# @return [String] a html safe string with relative time information
|
147
147
|
#
|
148
|
-
def
|
148
|
+
def _safe_relative_time(time)
|
149
149
|
return unless time
|
150
150
|
|
151
151
|
time = parse_time(time)
|
152
152
|
|
153
|
-
|
153
|
+
_relative_time(time)
|
154
154
|
end
|
155
155
|
|
156
156
|
#
|
@@ -42,7 +42,7 @@
|
|
42
42
|
<tbody>
|
43
43
|
<% @changelogs.each do |changelog| %>
|
44
44
|
<tr class="changelog-row">
|
45
|
-
<td><%=
|
45
|
+
<td><%= _safe_relative_time(changelog['time']) || "bogus" %></td>
|
46
46
|
<td><%= changelog["digest"] %></td>
|
47
47
|
<td><%= changelog["script"] %></td>
|
48
48
|
<td><%= changelog["job_id"] %></td>
|
@@ -65,7 +65,7 @@
|
|
65
65
|
<% @lock.locked_jids(with_values: true).each do |job_id, time| %>
|
66
66
|
<tr>
|
67
67
|
<td><%= job_id %></td>
|
68
|
-
<td><%=
|
68
|
+
<td><%= _safe_relative_time(time.to_f) %></td>
|
69
69
|
<td>
|
70
70
|
<form action="<%= root_path %>locks/<%= @lock.key %>/jobs/<%= job_id %>/delete" method="get">
|
71
71
|
<%= csrf_tag %>
|
@@ -92,7 +92,7 @@
|
|
92
92
|
<tbody>
|
93
93
|
<% @lock.changelogs.each do |entry| %>
|
94
94
|
<tr>
|
95
|
-
<td scope="row"><%=
|
95
|
+
<td scope="row"><%= _safe_relative_time(entry["time"].to_f) %></td>
|
96
96
|
<td><%= entry["job_id"] %></td>
|
97
97
|
<td><%= entry["message"] %></td>
|
98
98
|
<td><%= entry["script"] %></td>
|
@@ -46,7 +46,7 @@
|
|
46
46
|
<td><a href="<%= root_path %>locks/<%= lock.key %>"><%= lock.key %></a></td>
|
47
47
|
<td><%= lock.info["lock"] %></td>
|
48
48
|
<td><%= lock.locked.count %></td>
|
49
|
-
<td><%=
|
49
|
+
<td><%= _safe_relative_time(lock.created_at) %></td>
|
50
50
|
</tr>
|
51
51
|
</tbody>
|
52
52
|
<% end %>
|
@@ -13,11 +13,11 @@ module SidekiqUniqueJobs
|
|
13
13
|
end
|
14
14
|
|
15
15
|
app.get "/changelogs" do
|
16
|
-
@filter = params[:filter] || "*"
|
16
|
+
@filter = h(params[:filter] || "*")
|
17
17
|
@filter = "*" if @filter == ""
|
18
|
-
@count = (params[:count] || 100).to_i
|
19
|
-
@current_cursor = params[:cursor].to_i
|
20
|
-
@prev_cursor = params[:prev_cursor].to_i
|
18
|
+
@count = h(params[:count] || 100).to_i
|
19
|
+
@current_cursor = h(params[:cursor]).to_i
|
20
|
+
@prev_cursor = h(params[:prev_cursor]).to_i
|
21
21
|
@total_size, @next_cursor, @changelogs = changelog.page(
|
22
22
|
cursor: @current_cursor,
|
23
23
|
pattern: @filter,
|
@@ -33,11 +33,11 @@ module SidekiqUniqueJobs
|
|
33
33
|
end
|
34
34
|
|
35
35
|
app.get "/locks" do
|
36
|
-
@filter = params[:filter] || "*"
|
36
|
+
@filter = h(params[:filter]) || "*"
|
37
37
|
@filter = "*" if @filter == ""
|
38
|
-
@count = (params[:count] || 100).to_i
|
39
|
-
@current_cursor = params[:cursor].to_i
|
40
|
-
@prev_cursor = params[:prev_cursor].to_i
|
38
|
+
@count = h(params[:count] || 100).to_i
|
39
|
+
@current_cursor = h(params[:cursor]).to_i
|
40
|
+
@prev_cursor = h(params[:prev_cursor]).to_i
|
41
41
|
|
42
42
|
@total_size, @next_cursor, @locks = digests.page(
|
43
43
|
cursor: @current_cursor,
|
@@ -49,11 +49,11 @@ module SidekiqUniqueJobs
|
|
49
49
|
end
|
50
50
|
|
51
51
|
app.get "/expiring_locks" do
|
52
|
-
@filter = params[:filter] || "*"
|
52
|
+
@filter = h(params[:filter]) || "*"
|
53
53
|
@filter = "*" if @filter == ""
|
54
|
-
@count = (params[:count] || 100).to_i
|
55
|
-
@current_cursor = params[:cursor].to_i
|
56
|
-
@prev_cursor = params[:prev_cursor].to_i
|
54
|
+
@count = h(params[:count] || 100).to_i
|
55
|
+
@current_cursor = h(params[:cursor]).to_i
|
56
|
+
@prev_cursor = h(params[:prev_cursor]).to_i
|
57
57
|
|
58
58
|
@total_size, @next_cursor, @locks = expiring_digests.page(
|
59
59
|
cursor: @current_cursor,
|
@@ -71,22 +71,23 @@ module SidekiqUniqueJobs
|
|
71
71
|
end
|
72
72
|
|
73
73
|
app.get "/locks/:digest" do
|
74
|
-
@digest = params[:digest]
|
74
|
+
@digest = h(params[:digest])
|
75
75
|
@lock = SidekiqUniqueJobs::Lock.new(@digest)
|
76
76
|
|
77
77
|
erb(unique_template(:lock))
|
78
78
|
end
|
79
79
|
|
80
80
|
app.get "/locks/:digest/delete" do
|
81
|
-
digests.delete_by_digest(params[:digest])
|
82
|
-
expiring_digests.delete_by_digest(params[:digest])
|
81
|
+
digests.delete_by_digest(h(params[:digest]))
|
82
|
+
expiring_digests.delete_by_digest(h(params[:digest]))
|
83
83
|
redirect_to :locks
|
84
84
|
end
|
85
85
|
|
86
86
|
app.get "/locks/:digest/jobs/:job_id/delete" do
|
87
|
-
@digest = params[:digest]
|
87
|
+
@digest = h(params[:digest])
|
88
|
+
@job_id = h(params[:job_id])
|
88
89
|
@lock = SidekiqUniqueJobs::Lock.new(@digest)
|
89
|
-
@lock.unlock(
|
90
|
+
@lock.unlock(@job_id)
|
90
91
|
|
91
92
|
redirect_to "locks/#{@lock.key}"
|
92
93
|
end
|
data/lib/sidekiq_unique_jobs.rb
CHANGED
@@ -1,20 +1,22 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
2
|
|
3
|
-
require "
|
3
|
+
require "concurrent/executor/ruby_single_thread_executor"
|
4
4
|
require "concurrent/future"
|
5
|
-
require "concurrent/promises"
|
6
5
|
require "concurrent/map"
|
7
6
|
require "concurrent/mutable_struct"
|
7
|
+
require "concurrent/promises"
|
8
8
|
require "concurrent/timer_task"
|
9
|
-
require "concurrent/executor/ruby_single_thread_executor"
|
10
9
|
require "digest"
|
11
10
|
require "digest/sha1"
|
12
11
|
require "erb"
|
13
12
|
require "forwardable"
|
14
13
|
require "json"
|
15
14
|
require "pathname"
|
15
|
+
require "redis_client"
|
16
16
|
require "sidekiq"
|
17
17
|
|
18
|
+
require "sidekiq_unique_jobs/script"
|
19
|
+
|
18
20
|
require "sidekiq_unique_jobs/deprecation"
|
19
21
|
require "sidekiq_unique_jobs/reflections"
|
20
22
|
require "sidekiq_unique_jobs/reflectable"
|
@@ -29,7 +31,6 @@ require "sidekiq_unique_jobs/timing"
|
|
29
31
|
require "sidekiq_unique_jobs/sidekiq_worker_methods"
|
30
32
|
require "sidekiq_unique_jobs/connection"
|
31
33
|
require "sidekiq_unique_jobs/exceptions"
|
32
|
-
require "sidekiq_unique_jobs/script"
|
33
34
|
require "sidekiq_unique_jobs/script/caller"
|
34
35
|
require "sidekiq_unique_jobs/normalizer"
|
35
36
|
require "sidekiq_unique_jobs/job"
|
metadata
CHANGED
@@ -1,35 +1,15 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: sidekiq-unique-jobs
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 8.0.
|
4
|
+
version: 8.0.9
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Mikael Henriksson
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2024-02-12 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
|
-
- !ruby/object:Gem::Dependency
|
14
|
-
name: brpoplpush-redis_script
|
15
|
-
requirement: !ruby/object:Gem::Requirement
|
16
|
-
requirements:
|
17
|
-
- - ">"
|
18
|
-
- !ruby/object:Gem::Version
|
19
|
-
version: 0.1.1
|
20
|
-
- - "<="
|
21
|
-
- !ruby/object:Gem::Version
|
22
|
-
version: 2.0.0
|
23
|
-
type: :runtime
|
24
|
-
prerelease: false
|
25
|
-
version_requirements: !ruby/object:Gem::Requirement
|
26
|
-
requirements:
|
27
|
-
- - ">"
|
28
|
-
- !ruby/object:Gem::Version
|
29
|
-
version: 0.1.1
|
30
|
-
- - "<="
|
31
|
-
- !ruby/object:Gem::Version
|
32
|
-
version: 2.0.0
|
33
13
|
- !ruby/object:Gem::Dependency
|
34
14
|
name: concurrent-ruby
|
35
15
|
requirement: !ruby/object:Gem::Requirement
|
@@ -195,6 +175,15 @@ files:
|
|
195
175
|
- lib/sidekiq_unique_jobs/rspec/matchers/have_valid_sidekiq_options.rb
|
196
176
|
- lib/sidekiq_unique_jobs/script.rb
|
197
177
|
- lib/sidekiq_unique_jobs/script/caller.rb
|
178
|
+
- lib/sidekiq_unique_jobs/script/client.rb
|
179
|
+
- lib/sidekiq_unique_jobs/script/config.rb
|
180
|
+
- lib/sidekiq_unique_jobs/script/dsl.rb
|
181
|
+
- lib/sidekiq_unique_jobs/script/logging.rb
|
182
|
+
- lib/sidekiq_unique_jobs/script/lua_error.rb
|
183
|
+
- lib/sidekiq_unique_jobs/script/script.rb
|
184
|
+
- lib/sidekiq_unique_jobs/script/scripts.rb
|
185
|
+
- lib/sidekiq_unique_jobs/script/template.rb
|
186
|
+
- lib/sidekiq_unique_jobs/script/timing.rb
|
198
187
|
- lib/sidekiq_unique_jobs/server.rb
|
199
188
|
- lib/sidekiq_unique_jobs/sidekiq_unique_ext.rb
|
200
189
|
- lib/sidekiq_unique_jobs/sidekiq_unique_jobs.rb
|
@@ -234,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
234
223
|
- !ruby/object:Gem::Version
|
235
224
|
version: '0'
|
236
225
|
requirements: []
|
237
|
-
rubygems_version: 3.
|
226
|
+
rubygems_version: 3.5.6
|
238
227
|
signing_key:
|
239
228
|
specification_version: 4
|
240
229
|
summary: Sidekiq middleware that prevents duplicates jobs
|