sidekiq 5.2.1 → 6.0.7
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of sidekiq might be problematic. Click here for more details.
- checksums.yaml +5 -5
- data/.circleci/config.yml +60 -0
- data/.gitignore +1 -1
- data/.standard.yml +20 -0
- data/6.0-Upgrade.md +72 -0
- data/COMM-LICENSE +11 -9
- data/Changes.md +209 -0
- data/Ent-2.0-Upgrade.md +37 -0
- data/Ent-Changes.md +36 -1
- data/Gemfile +19 -9
- data/Gemfile.lock +208 -0
- data/Pro-5.0-Upgrade.md +25 -0
- data/Pro-Changes.md +44 -1
- data/README.md +19 -31
- data/Rakefile +6 -4
- data/bin/sidekiq +19 -0
- data/bin/sidekiqload +33 -25
- data/bin/sidekiqmon +8 -0
- data/lib/generators/sidekiq/templates/worker_test.rb.erb +1 -1
- data/lib/generators/sidekiq/worker_generator.rb +21 -13
- data/lib/sidekiq/api.rb +240 -214
- data/lib/sidekiq/cli.rb +167 -219
- data/lib/sidekiq/client.rb +61 -46
- data/lib/sidekiq/delay.rb +5 -6
- data/lib/sidekiq/exception_handler.rb +10 -12
- data/lib/sidekiq/extensions/action_mailer.rb +10 -20
- data/lib/sidekiq/extensions/active_record.rb +9 -7
- data/lib/sidekiq/extensions/class_methods.rb +9 -7
- data/lib/sidekiq/extensions/generic_proxy.rb +4 -4
- data/lib/sidekiq/fetch.rb +11 -12
- data/lib/sidekiq/job_logger.rb +47 -9
- data/lib/sidekiq/job_retry.rb +79 -58
- data/lib/sidekiq/launcher.rb +86 -54
- data/lib/sidekiq/logger.rb +165 -0
- data/lib/sidekiq/manager.rb +10 -12
- data/lib/sidekiq/middleware/chain.rb +14 -4
- data/lib/sidekiq/middleware/i18n.rb +5 -7
- data/lib/sidekiq/monitor.rb +133 -0
- data/lib/sidekiq/paginator.rb +18 -14
- data/lib/sidekiq/processor.rb +113 -79
- data/lib/sidekiq/rails.rb +24 -29
- data/lib/sidekiq/redis_connection.rb +42 -24
- data/lib/sidekiq/scheduled.rb +28 -29
- data/lib/sidekiq/sd_notify.rb +149 -0
- data/lib/sidekiq/systemd.rb +24 -0
- data/lib/sidekiq/testing/inline.rb +2 -1
- data/lib/sidekiq/testing.rb +34 -23
- data/lib/sidekiq/util.rb +17 -16
- data/lib/sidekiq/version.rb +2 -1
- data/lib/sidekiq/web/action.rb +14 -10
- data/lib/sidekiq/web/application.rb +79 -69
- data/lib/sidekiq/web/helpers.rb +89 -71
- data/lib/sidekiq/web/router.rb +17 -16
- data/lib/sidekiq/web.rb +41 -49
- data/lib/sidekiq/worker.rb +134 -91
- data/lib/sidekiq.rb +69 -44
- data/sidekiq.gemspec +16 -18
- data/web/assets/javascripts/application.js +22 -19
- data/web/assets/javascripts/dashboard.js +16 -25
- data/web/assets/stylesheets/application-dark.css +122 -0
- data/web/assets/stylesheets/application.css +44 -2
- data/web/assets/stylesheets/bootstrap.css +1 -1
- data/web/locales/ar.yml +1 -0
- data/web/locales/de.yml +14 -2
- data/web/locales/en.yml +3 -0
- data/web/locales/fr.yml +2 -2
- data/web/locales/ja.yml +4 -1
- data/web/locales/lt.yml +83 -0
- data/web/locales/vi.yml +83 -0
- data/web/views/_job_info.erb +2 -1
- data/web/views/_nav.erb +3 -17
- data/web/views/busy.erb +4 -1
- data/web/views/dead.erb +2 -2
- data/web/views/layout.erb +1 -0
- data/web/views/morgue.erb +4 -1
- data/web/views/queue.erb +11 -1
- data/web/views/queues.erb +9 -1
- data/web/views/retries.erb +8 -1
- data/web/views/retry.erb +2 -2
- data/web/views/scheduled.erb +4 -1
- metadata +37 -27
- data/.travis.yml +0 -14
- data/bin/sidekiqctl +0 -99
- data/lib/sidekiq/core_ext.rb +0 -1
- data/lib/sidekiq/logging.rb +0 -122
- data/lib/sidekiq/middleware/server/active_record.rb +0 -23
data/lib/sidekiq/worker.rb
CHANGED
@@ -1,19 +1,19 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require 'sidekiq/client'
|
3
2
|
|
4
|
-
|
3
|
+
require "sidekiq/client"
|
5
4
|
|
5
|
+
module Sidekiq
|
6
6
|
##
|
7
7
|
# Include this module in your worker class and you can easily create
|
8
8
|
# asynchronous jobs:
|
9
9
|
#
|
10
|
-
#
|
11
|
-
#
|
10
|
+
# class HardWorker
|
11
|
+
# include Sidekiq::Worker
|
12
12
|
#
|
13
|
-
#
|
14
|
-
#
|
13
|
+
# def perform(*args)
|
14
|
+
# # do some work
|
15
|
+
# end
|
15
16
|
# end
|
16
|
-
# end
|
17
17
|
#
|
18
18
|
# Then in your Rails app, you can do this:
|
19
19
|
#
|
@@ -21,15 +21,124 @@ module Sidekiq
|
|
21
21
|
#
|
22
22
|
# Note that perform_async is a class method, perform is an instance method.
|
23
23
|
module Worker
|
24
|
+
##
|
25
|
+
# The Options module is extracted so we can include it in ActiveJob::Base
|
26
|
+
# and allow native AJs to configure Sidekiq features/internals.
|
27
|
+
module Options
|
28
|
+
def self.included(base)
|
29
|
+
base.extend(ClassMethods)
|
30
|
+
base.sidekiq_class_attribute :sidekiq_options_hash
|
31
|
+
base.sidekiq_class_attribute :sidekiq_retry_in_block
|
32
|
+
base.sidekiq_class_attribute :sidekiq_retries_exhausted_block
|
33
|
+
end
|
34
|
+
|
35
|
+
module ClassMethods
|
36
|
+
ACCESSOR_MUTEX = Mutex.new
|
37
|
+
|
38
|
+
##
|
39
|
+
# Allows customization for this type of Worker.
|
40
|
+
# Legal options:
|
41
|
+
#
|
42
|
+
# queue - name of queue to use for this job type, default *default*
|
43
|
+
# retry - enable retries for this Worker in case of error during execution,
|
44
|
+
# *true* to use the default or *Integer* count
|
45
|
+
# backtrace - whether to save any error backtrace in the retry payload to display in web UI,
|
46
|
+
# can be true, false or an integer number of lines to save, default *false*
|
47
|
+
#
|
48
|
+
# In practice, any option is allowed. This is the main mechanism to configure the
|
49
|
+
# options for a specific job.
|
50
|
+
def sidekiq_options(opts = {})
|
51
|
+
opts = opts.transform_keys(&:to_s) # stringify
|
52
|
+
self.sidekiq_options_hash = get_sidekiq_options.merge(opts)
|
53
|
+
end
|
54
|
+
|
55
|
+
def sidekiq_retry_in(&block)
|
56
|
+
self.sidekiq_retry_in_block = block
|
57
|
+
end
|
58
|
+
|
59
|
+
def sidekiq_retries_exhausted(&block)
|
60
|
+
self.sidekiq_retries_exhausted_block = block
|
61
|
+
end
|
62
|
+
|
63
|
+
def get_sidekiq_options # :nodoc:
|
64
|
+
self.sidekiq_options_hash ||= Sidekiq.default_worker_options
|
65
|
+
end
|
66
|
+
|
67
|
+
def sidekiq_class_attribute(*attrs)
|
68
|
+
instance_reader = true
|
69
|
+
instance_writer = true
|
70
|
+
|
71
|
+
attrs.each do |name|
|
72
|
+
synchronized_getter = "__synchronized_#{name}"
|
73
|
+
|
74
|
+
singleton_class.instance_eval do
|
75
|
+
undef_method(name) if method_defined?(name) || private_method_defined?(name)
|
76
|
+
end
|
77
|
+
|
78
|
+
define_singleton_method(synchronized_getter) { nil }
|
79
|
+
singleton_class.class_eval do
|
80
|
+
private(synchronized_getter)
|
81
|
+
end
|
82
|
+
|
83
|
+
define_singleton_method(name) { ACCESSOR_MUTEX.synchronize { send synchronized_getter } }
|
84
|
+
|
85
|
+
ivar = "@#{name}"
|
86
|
+
|
87
|
+
singleton_class.instance_eval do
|
88
|
+
m = "#{name}="
|
89
|
+
undef_method(m) if method_defined?(m) || private_method_defined?(m)
|
90
|
+
end
|
91
|
+
define_singleton_method("#{name}=") do |val|
|
92
|
+
singleton_class.class_eval do
|
93
|
+
ACCESSOR_MUTEX.synchronize do
|
94
|
+
undef_method(synchronized_getter) if method_defined?(synchronized_getter) || private_method_defined?(synchronized_getter)
|
95
|
+
define_method(synchronized_getter) { val }
|
96
|
+
end
|
97
|
+
end
|
98
|
+
|
99
|
+
if singleton_class?
|
100
|
+
class_eval do
|
101
|
+
undef_method(name) if method_defined?(name) || private_method_defined?(name)
|
102
|
+
define_method(name) do
|
103
|
+
if instance_variable_defined? ivar
|
104
|
+
instance_variable_get ivar
|
105
|
+
else
|
106
|
+
singleton_class.send name
|
107
|
+
end
|
108
|
+
end
|
109
|
+
end
|
110
|
+
end
|
111
|
+
val
|
112
|
+
end
|
113
|
+
|
114
|
+
if instance_reader
|
115
|
+
undef_method(name) if method_defined?(name) || private_method_defined?(name)
|
116
|
+
define_method(name) do
|
117
|
+
if instance_variable_defined?(ivar)
|
118
|
+
instance_variable_get ivar
|
119
|
+
else
|
120
|
+
self.class.public_send name
|
121
|
+
end
|
122
|
+
end
|
123
|
+
end
|
124
|
+
|
125
|
+
if instance_writer
|
126
|
+
m = "#{name}="
|
127
|
+
undef_method(m) if method_defined?(m) || private_method_defined?(m)
|
128
|
+
attr_writer name
|
129
|
+
end
|
130
|
+
end
|
131
|
+
end
|
132
|
+
end
|
133
|
+
end
|
134
|
+
|
24
135
|
attr_accessor :jid
|
25
136
|
|
26
137
|
def self.included(base)
|
27
|
-
raise ArgumentError, "
|
138
|
+
raise ArgumentError, "Sidekiq::Worker cannot be included in an ActiveJob: #{base.name}" if base.ancestors.any? { |c| c.name == "ActiveJob::Base" }
|
28
139
|
|
140
|
+
base.include(Options)
|
29
141
|
base.extend(ClassMethods)
|
30
|
-
base.sidekiq_class_attribute :sidekiq_options_hash
|
31
|
-
base.sidekiq_class_attribute :sidekiq_retry_in_block
|
32
|
-
base.sidekiq_class_attribute :sidekiq_retries_exhausted_block
|
33
142
|
end
|
34
143
|
|
35
144
|
def logger
|
@@ -46,8 +155,13 @@ module Sidekiq
|
|
46
155
|
@opts = opts
|
47
156
|
end
|
48
157
|
|
158
|
+
def set(options)
|
159
|
+
@opts.merge!(options)
|
160
|
+
self
|
161
|
+
end
|
162
|
+
|
49
163
|
def perform_async(*args)
|
50
|
-
@klass.client_push(@opts.merge(
|
164
|
+
@klass.client_push(@opts.merge("args" => args, "class" => @klass))
|
51
165
|
end
|
52
166
|
|
53
167
|
# +interval+ must be a timestamp, numeric or something that acts
|
@@ -57,16 +171,15 @@ module Sidekiq
|
|
57
171
|
now = Time.now.to_f
|
58
172
|
ts = (int < 1_000_000_000 ? now + int : int)
|
59
173
|
|
60
|
-
payload = @opts.merge(
|
174
|
+
payload = @opts.merge("class" => @klass, "args" => args)
|
61
175
|
# Optimization to enqueue something now that is scheduled to go out now or in the past
|
62
|
-
payload
|
176
|
+
payload["at"] = ts if ts > now
|
63
177
|
@klass.client_push(payload)
|
64
178
|
end
|
65
179
|
alias_method :perform_at, :perform_in
|
66
180
|
end
|
67
181
|
|
68
182
|
module ClassMethods
|
69
|
-
|
70
183
|
def delay(*args)
|
71
184
|
raise ArgumentError, "Do not call .delay on a Sidekiq::Worker class, call .perform_async"
|
72
185
|
end
|
@@ -84,7 +197,7 @@ module Sidekiq
|
|
84
197
|
end
|
85
198
|
|
86
199
|
def perform_async(*args)
|
87
|
-
client_push(
|
200
|
+
client_push("class" => self, "args" => args)
|
88
201
|
end
|
89
202
|
|
90
203
|
# +interval+ must be a timestamp, numeric or something that acts
|
@@ -94,10 +207,10 @@ module Sidekiq
|
|
94
207
|
now = Time.now.to_f
|
95
208
|
ts = (int < 1_000_000_000 ? now + int : int)
|
96
209
|
|
97
|
-
item = {
|
210
|
+
item = {"class" => self, "args" => args}
|
98
211
|
|
99
212
|
# Optimization to enqueue something now that is scheduled to go out now or in the past
|
100
|
-
item
|
213
|
+
item["at"] = ts if ts > now
|
101
214
|
|
102
215
|
client_push(item)
|
103
216
|
end
|
@@ -116,25 +229,12 @@ module Sidekiq
|
|
116
229
|
#
|
117
230
|
# In practice, any option is allowed. This is the main mechanism to configure the
|
118
231
|
# options for a specific job.
|
119
|
-
def sidekiq_options(opts={})
|
120
|
-
|
121
|
-
self.sidekiq_options_hash = get_sidekiq_options.merge(Hash[opts.map{|k, v| [k.to_s, v]}])
|
122
|
-
end
|
123
|
-
|
124
|
-
def sidekiq_retry_in(&block)
|
125
|
-
self.sidekiq_retry_in_block = block
|
126
|
-
end
|
127
|
-
|
128
|
-
def sidekiq_retries_exhausted(&block)
|
129
|
-
self.sidekiq_retries_exhausted_block = block
|
130
|
-
end
|
131
|
-
|
132
|
-
def get_sidekiq_options # :nodoc:
|
133
|
-
self.sidekiq_options_hash ||= Sidekiq.default_worker_options
|
232
|
+
def sidekiq_options(opts = {})
|
233
|
+
super
|
134
234
|
end
|
135
235
|
|
136
236
|
def client_push(item) # :nodoc:
|
137
|
-
pool = Thread.current[:sidekiq_via_pool] || get_sidekiq_options[
|
237
|
+
pool = Thread.current[:sidekiq_via_pool] || get_sidekiq_options["pool"] || Sidekiq.redis_pool
|
138
238
|
# stringify
|
139
239
|
item.keys.each do |key|
|
140
240
|
item[key.to_s] = item.delete(key)
|
@@ -142,63 +242,6 @@ module Sidekiq
|
|
142
242
|
|
143
243
|
Sidekiq::Client.new(pool).push(item)
|
144
244
|
end
|
145
|
-
|
146
|
-
def sidekiq_class_attribute(*attrs)
|
147
|
-
instance_reader = true
|
148
|
-
instance_writer = true
|
149
|
-
|
150
|
-
attrs.each do |name|
|
151
|
-
singleton_class.instance_eval do
|
152
|
-
undef_method(name) if method_defined?(name) || private_method_defined?(name)
|
153
|
-
end
|
154
|
-
define_singleton_method(name) { nil }
|
155
|
-
|
156
|
-
ivar = "@#{name}"
|
157
|
-
|
158
|
-
singleton_class.instance_eval do
|
159
|
-
m = "#{name}="
|
160
|
-
undef_method(m) if method_defined?(m) || private_method_defined?(m)
|
161
|
-
end
|
162
|
-
define_singleton_method("#{name}=") do |val|
|
163
|
-
singleton_class.class_eval do
|
164
|
-
undef_method(name) if method_defined?(name) || private_method_defined?(name)
|
165
|
-
define_method(name) { val }
|
166
|
-
end
|
167
|
-
|
168
|
-
if singleton_class?
|
169
|
-
class_eval do
|
170
|
-
undef_method(name) if method_defined?(name) || private_method_defined?(name)
|
171
|
-
define_method(name) do
|
172
|
-
if instance_variable_defined? ivar
|
173
|
-
instance_variable_get ivar
|
174
|
-
else
|
175
|
-
singleton_class.send name
|
176
|
-
end
|
177
|
-
end
|
178
|
-
end
|
179
|
-
end
|
180
|
-
val
|
181
|
-
end
|
182
|
-
|
183
|
-
if instance_reader
|
184
|
-
undef_method(name) if method_defined?(name) || private_method_defined?(name)
|
185
|
-
define_method(name) do
|
186
|
-
if instance_variable_defined?(ivar)
|
187
|
-
instance_variable_get ivar
|
188
|
-
else
|
189
|
-
self.class.public_send name
|
190
|
-
end
|
191
|
-
end
|
192
|
-
end
|
193
|
-
|
194
|
-
if instance_writer
|
195
|
-
m = "#{name}="
|
196
|
-
undef_method(m) if method_defined?(m) || private_method_defined?(m)
|
197
|
-
attr_writer name
|
198
|
-
end
|
199
|
-
end
|
200
|
-
end
|
201
|
-
|
202
245
|
end
|
203
246
|
end
|
204
247
|
end
|
data/lib/sidekiq.rb
CHANGED
@@ -1,26 +1,27 @@
|
|
1
1
|
# frozen_string_literal: true
|
2
|
-
require 'sidekiq/version'
|
3
|
-
fail "Sidekiq #{Sidekiq::VERSION} does not support Ruby versions below 2.2.2." if RUBY_PLATFORM != 'java' && Gem::Version.new(RUBY_VERSION) < Gem::Version.new('2.2.2')
|
4
2
|
|
5
|
-
require
|
6
|
-
|
7
|
-
require 'sidekiq/worker'
|
8
|
-
require 'sidekiq/redis_connection'
|
9
|
-
require 'sidekiq/delay'
|
3
|
+
require "sidekiq/version"
|
4
|
+
fail "Sidekiq #{Sidekiq::VERSION} does not support Ruby versions below 2.5.0." if RUBY_PLATFORM != "java" && Gem::Version.new(RUBY_VERSION) < Gem::Version.new("2.5.0")
|
10
5
|
|
11
|
-
require
|
6
|
+
require "sidekiq/logger"
|
7
|
+
require "sidekiq/client"
|
8
|
+
require "sidekiq/worker"
|
9
|
+
require "sidekiq/redis_connection"
|
10
|
+
require "sidekiq/delay"
|
11
|
+
|
12
|
+
require "json"
|
12
13
|
|
13
14
|
module Sidekiq
|
14
|
-
NAME =
|
15
|
-
LICENSE =
|
15
|
+
NAME = "Sidekiq"
|
16
|
+
LICENSE = "See LICENSE and the LGPL-3.0 for licensing details."
|
16
17
|
|
17
18
|
DEFAULTS = {
|
18
19
|
queues: [],
|
19
20
|
labels: [],
|
20
21
|
concurrency: 10,
|
21
|
-
require:
|
22
|
+
require: ".",
|
22
23
|
environment: nil,
|
23
|
-
timeout:
|
24
|
+
timeout: 25,
|
24
25
|
poll_interval_average: nil,
|
25
26
|
average_scheduled_poll_interval: 5,
|
26
27
|
error_handlers: [],
|
@@ -29,16 +30,16 @@ module Sidekiq
|
|
29
30
|
startup: [],
|
30
31
|
quiet: [],
|
31
32
|
shutdown: [],
|
32
|
-
heartbeat: []
|
33
|
+
heartbeat: []
|
33
34
|
},
|
34
35
|
dead_max_jobs: 10_000,
|
35
36
|
dead_timeout_in_seconds: 180 * 24 * 60 * 60, # 6 months
|
36
|
-
reloader: proc { |&block| block.call }
|
37
|
+
reloader: proc { |&block| block.call }
|
37
38
|
}
|
38
39
|
|
39
40
|
DEFAULT_WORKER_OPTIONS = {
|
40
|
-
|
41
|
-
|
41
|
+
"retry" => true,
|
42
|
+
"queue" => "default"
|
42
43
|
}
|
43
44
|
|
44
45
|
FAKE_INFO = {
|
@@ -56,6 +57,7 @@ module Sidekiq
|
|
56
57
|
def self.options
|
57
58
|
@options ||= DEFAULTS.dup
|
58
59
|
end
|
60
|
+
|
59
61
|
def self.options=(opts)
|
60
62
|
@options = opts
|
61
63
|
end
|
@@ -94,9 +96,13 @@ module Sidekiq
|
|
94
96
|
begin
|
95
97
|
yield conn
|
96
98
|
rescue Redis::CommandError => ex
|
97
|
-
#2550 Failover can cause the server to become a
|
98
|
-
# to disconnect and reopen the socket to get back to the
|
99
|
-
|
99
|
+
# 2550 Failover can cause the server to become a replica, need
|
100
|
+
# to disconnect and reopen the socket to get back to the primary.
|
101
|
+
if retryable && ex.message =~ /READONLY/
|
102
|
+
conn.disconnect!
|
103
|
+
retryable = false
|
104
|
+
retry
|
105
|
+
end
|
100
106
|
raise
|
101
107
|
end
|
102
108
|
end
|
@@ -104,19 +110,17 @@ module Sidekiq
|
|
104
110
|
|
105
111
|
def self.redis_info
|
106
112
|
redis do |conn|
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
conn.info
|
114
|
-
end
|
115
|
-
rescue Redis::CommandError => ex
|
116
|
-
#2850 return fake version when INFO command has (probably) been renamed
|
117
|
-
raise unless ex.message =~ /unknown command/
|
118
|
-
FAKE_INFO
|
113
|
+
# admin commands can't go through redis-namespace starting
|
114
|
+
# in redis-namespace 2.0
|
115
|
+
if conn.respond_to?(:namespace)
|
116
|
+
conn.redis.info
|
117
|
+
else
|
118
|
+
conn.info
|
119
119
|
end
|
120
|
+
rescue Redis::CommandError => ex
|
121
|
+
# 2850 return fake version when INFO command has (probably) been renamed
|
122
|
+
raise unless /unknown command/.match?(ex.message)
|
123
|
+
FAKE_INFO
|
120
124
|
end
|
121
125
|
end
|
122
126
|
|
@@ -150,18 +154,13 @@ module Sidekiq
|
|
150
154
|
|
151
155
|
def self.default_worker_options=(hash)
|
152
156
|
# stringify
|
153
|
-
@default_worker_options = default_worker_options.merge(
|
157
|
+
@default_worker_options = default_worker_options.merge(hash.transform_keys(&:to_s))
|
154
158
|
end
|
159
|
+
|
155
160
|
def self.default_worker_options
|
156
161
|
defined?(@default_worker_options) ? @default_worker_options : DEFAULT_WORKER_OPTIONS
|
157
162
|
end
|
158
163
|
|
159
|
-
def self.default_retries_exhausted=(prok)
|
160
|
-
logger.info { "default_retries_exhausted is deprecated, please use `config.death_handlers << -> {|job, ex| }`" }
|
161
|
-
return nil unless prok
|
162
|
-
death_handlers << prok
|
163
|
-
end
|
164
|
-
|
165
164
|
##
|
166
165
|
# Death handlers are called when all retries for a job have been exhausted and
|
167
166
|
# the job dies. It's the notification to your application
|
@@ -178,15 +177,41 @@ module Sidekiq
|
|
178
177
|
def self.load_json(string)
|
179
178
|
JSON.parse(string)
|
180
179
|
end
|
180
|
+
|
181
181
|
def self.dump_json(object)
|
182
182
|
JSON.generate(object)
|
183
183
|
end
|
184
184
|
|
185
|
+
def self.log_formatter
|
186
|
+
@log_formatter ||= if ENV["DYNO"]
|
187
|
+
Sidekiq::Logger::Formatters::WithoutTimestamp.new
|
188
|
+
else
|
189
|
+
Sidekiq::Logger::Formatters::Pretty.new
|
190
|
+
end
|
191
|
+
end
|
192
|
+
|
193
|
+
def self.log_formatter=(log_formatter)
|
194
|
+
@log_formatter = log_formatter
|
195
|
+
logger.formatter = log_formatter
|
196
|
+
end
|
197
|
+
|
185
198
|
def self.logger
|
186
|
-
Sidekiq::
|
199
|
+
@logger ||= Sidekiq::Logger.new(STDOUT, level: Logger::INFO)
|
187
200
|
end
|
188
|
-
|
189
|
-
|
201
|
+
|
202
|
+
def self.logger=(logger)
|
203
|
+
if logger.nil?
|
204
|
+
self.logger.level = Logger::FATAL
|
205
|
+
return self.logger
|
206
|
+
end
|
207
|
+
|
208
|
+
logger.extend(Sidekiq::LoggingUtils)
|
209
|
+
|
210
|
+
@logger = logger
|
211
|
+
end
|
212
|
+
|
213
|
+
def self.pro?
|
214
|
+
defined?(Sidekiq::Pro)
|
190
215
|
end
|
191
216
|
|
192
217
|
# How frequently Redis should be checked by a random Sidekiq process for
|
@@ -195,7 +220,7 @@ module Sidekiq
|
|
195
220
|
#
|
196
221
|
# See sidekiq/scheduled.rb for an in-depth explanation of this value
|
197
222
|
def self.average_scheduled_poll_interval=(interval)
|
198
|
-
|
223
|
+
options[:average_scheduled_poll_interval] = interval
|
199
224
|
end
|
200
225
|
|
201
226
|
# Register a proc to handle any error which occurs within the Sidekiq process.
|
@@ -206,7 +231,7 @@ module Sidekiq
|
|
206
231
|
#
|
207
232
|
# The default error handler logs errors to Sidekiq.logger.
|
208
233
|
def self.error_handlers
|
209
|
-
|
234
|
+
options[:error_handlers]
|
210
235
|
end
|
211
236
|
|
212
237
|
# Register a block to run at a point in the Sidekiq lifecycle.
|
@@ -232,4 +257,4 @@ module Sidekiq
|
|
232
257
|
class Shutdown < Interrupt; end
|
233
258
|
end
|
234
259
|
|
235
|
-
require
|
260
|
+
require "sidekiq/rails" if defined?(::Rails::Engine)
|
data/sidekiq.gemspec
CHANGED
@@ -1,23 +1,21 @@
|
|
1
|
-
|
2
|
-
require File.expand_path('../lib/sidekiq/version', __FILE__)
|
1
|
+
require_relative "lib/sidekiq/version"
|
3
2
|
|
4
3
|
Gem::Specification.new do |gem|
|
5
|
-
gem.authors
|
6
|
-
gem.email
|
7
|
-
gem.summary
|
8
|
-
gem.description
|
9
|
-
gem.homepage
|
10
|
-
gem.license
|
4
|
+
gem.authors = ["Mike Perham"]
|
5
|
+
gem.email = ["mperham@gmail.com"]
|
6
|
+
gem.summary = "Simple, efficient background processing for Ruby"
|
7
|
+
gem.description = "Simple, efficient background processing for Ruby."
|
8
|
+
gem.homepage = "http://sidekiq.org"
|
9
|
+
gem.license = "LGPL-3.0"
|
11
10
|
|
12
|
-
gem.executables
|
13
|
-
gem.files
|
14
|
-
gem.
|
15
|
-
gem.
|
16
|
-
gem.
|
17
|
-
gem.version = Sidekiq::VERSION
|
18
|
-
gem.required_ruby_version = ">= 2.2.2"
|
11
|
+
gem.executables = ["sidekiq", "sidekiqmon"]
|
12
|
+
gem.files = `git ls-files | grep -Ev '^(test|myapp|examples)'`.split("\n")
|
13
|
+
gem.name = "sidekiq"
|
14
|
+
gem.version = Sidekiq::VERSION
|
15
|
+
gem.required_ruby_version = ">= 2.5.0"
|
19
16
|
|
20
|
-
gem.add_dependency
|
21
|
-
gem.add_dependency
|
22
|
-
gem.add_dependency
|
17
|
+
gem.add_dependency "redis", ">= 4.1.0"
|
18
|
+
gem.add_dependency "connection_pool", ">= 2.2.2"
|
19
|
+
gem.add_dependency "rack", "~> 2.0"
|
20
|
+
gem.add_dependency "rack-protection", ">= 2.0.0"
|
23
21
|
end
|
@@ -19,7 +19,8 @@ Sidekiq = {};
|
|
19
19
|
$(function() {
|
20
20
|
var pollpath = $('body').data('poll-path');
|
21
21
|
if (pollpath != "") {
|
22
|
-
|
22
|
+
var ti = parseInt(localStorage.timeInterval) || 2000;
|
23
|
+
setTimeout(function(){updatePage(pollpath)}, ti);
|
23
24
|
}
|
24
25
|
|
25
26
|
$(document).on('click', '.check_all', function() {
|
@@ -55,26 +56,28 @@ function updateFuzzyTimes(locale) {
|
|
55
56
|
}
|
56
57
|
|
57
58
|
function updatePage(url) {
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
59
|
+
$.ajax({
|
60
|
+
url: url,
|
61
|
+
dataType: 'html'
|
62
|
+
}).done(function(data) {
|
63
|
+
$data = $(data)
|
64
|
+
|
65
|
+
var $page = $data.filter('#page')
|
66
|
+
$('#page').replaceWith($page)
|
67
|
+
|
68
|
+
var $header_status = $data.find('.status')
|
69
|
+
$('.status').replaceWith($header_status)
|
70
|
+
|
71
|
+
updateFuzzyTimes($('body').data('locale'));
|
72
|
+
|
73
|
+
var ti = parseInt(localStorage.timeInterval) || 2000;
|
74
|
+
setTimeout(function(){updatePage(url)}, ti)
|
75
|
+
}).fail(function() {
|
76
|
+
var ti = parseInt(localStorage.timeInterval) || 2000;
|
77
|
+
setTimeout(function(){updatePage(url)}, ti)
|
78
|
+
})
|
74
79
|
}
|
75
80
|
|
76
|
-
|
77
|
-
|
78
81
|
$(function() {
|
79
82
|
'use strict';
|
80
83
|
|