sidekiq 6.3.1 → 7.1.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Changes.md +285 -11
- data/LICENSE.txt +9 -0
- data/README.md +47 -34
- data/bin/sidekiq +4 -9
- data/bin/sidekiqload +207 -117
- data/bin/sidekiqmon +4 -1
- data/lib/generators/sidekiq/job_generator.rb +57 -0
- data/lib/generators/sidekiq/templates/{worker.rb.erb → job.rb.erb} +2 -2
- data/lib/generators/sidekiq/templates/{worker_spec.rb.erb → job_spec.rb.erb} +1 -1
- data/lib/generators/sidekiq/templates/{worker_test.rb.erb → job_test.rb.erb} +1 -1
- data/lib/sidekiq/api.rb +333 -190
- data/lib/sidekiq/capsule.rb +127 -0
- data/lib/sidekiq/cli.rb +86 -80
- data/lib/sidekiq/client.rb +104 -95
- data/lib/sidekiq/{util.rb → component.rb} +14 -41
- data/lib/sidekiq/config.rb +282 -0
- data/lib/sidekiq/deploy.rb +62 -0
- data/lib/sidekiq/embedded.rb +61 -0
- data/lib/sidekiq/fetch.rb +23 -24
- data/lib/sidekiq/job.rb +371 -10
- data/lib/sidekiq/job_logger.rb +16 -28
- data/lib/sidekiq/job_retry.rb +99 -58
- data/lib/sidekiq/job_util.rb +107 -0
- data/lib/sidekiq/launcher.rb +103 -95
- data/lib/sidekiq/logger.rb +9 -44
- data/lib/sidekiq/manager.rb +40 -41
- data/lib/sidekiq/metrics/query.rb +153 -0
- data/lib/sidekiq/metrics/shared.rb +95 -0
- data/lib/sidekiq/metrics/tracking.rb +136 -0
- data/lib/sidekiq/middleware/chain.rb +96 -51
- data/lib/sidekiq/middleware/current_attributes.rb +59 -16
- data/lib/sidekiq/middleware/i18n.rb +6 -4
- data/lib/sidekiq/middleware/modules.rb +21 -0
- data/lib/sidekiq/monitor.rb +17 -4
- data/lib/sidekiq/paginator.rb +17 -9
- data/lib/sidekiq/processor.rb +81 -80
- data/lib/sidekiq/rails.rb +21 -14
- data/lib/sidekiq/redis_client_adapter.rb +95 -0
- data/lib/sidekiq/redis_connection.rb +14 -82
- data/lib/sidekiq/ring_buffer.rb +29 -0
- data/lib/sidekiq/scheduled.rb +76 -38
- data/lib/sidekiq/testing/inline.rb +4 -4
- data/lib/sidekiq/testing.rb +42 -69
- data/lib/sidekiq/transaction_aware_client.rb +44 -0
- data/lib/sidekiq/version.rb +2 -1
- data/lib/sidekiq/web/action.rb +3 -3
- data/lib/sidekiq/web/application.rb +95 -11
- data/lib/sidekiq/web/csrf_protection.rb +4 -4
- data/lib/sidekiq/web/helpers.rb +58 -30
- data/lib/sidekiq/web.rb +22 -17
- data/lib/sidekiq/worker_compatibility_alias.rb +13 -0
- data/lib/sidekiq.rb +85 -202
- data/sidekiq.gemspec +12 -10
- data/web/assets/javascripts/application.js +77 -26
- data/web/assets/javascripts/base-charts.js +106 -0
- data/web/assets/javascripts/chart.min.js +13 -0
- data/web/assets/javascripts/chartjs-plugin-annotation.min.js +7 -0
- data/web/assets/javascripts/dashboard-charts.js +168 -0
- data/web/assets/javascripts/dashboard.js +3 -240
- data/web/assets/javascripts/metrics.js +264 -0
- data/web/assets/stylesheets/application-dark.css +17 -17
- data/web/assets/stylesheets/application-rtl.css +2 -91
- data/web/assets/stylesheets/application.css +69 -302
- data/web/locales/ar.yml +70 -70
- data/web/locales/cs.yml +62 -62
- data/web/locales/da.yml +60 -53
- data/web/locales/de.yml +65 -65
- data/web/locales/el.yml +43 -24
- data/web/locales/en.yml +84 -69
- data/web/locales/es.yml +68 -68
- data/web/locales/fa.yml +65 -65
- data/web/locales/fr.yml +81 -67
- data/web/locales/gd.yml +99 -0
- data/web/locales/he.yml +65 -64
- data/web/locales/hi.yml +59 -59
- data/web/locales/it.yml +53 -53
- data/web/locales/ja.yml +73 -68
- data/web/locales/ko.yml +52 -52
- data/web/locales/lt.yml +66 -66
- data/web/locales/nb.yml +61 -61
- data/web/locales/nl.yml +52 -52
- data/web/locales/pl.yml +45 -45
- data/web/locales/pt-br.yml +83 -55
- data/web/locales/pt.yml +51 -51
- data/web/locales/ru.yml +67 -66
- data/web/locales/sv.yml +53 -53
- data/web/locales/ta.yml +60 -60
- data/web/locales/uk.yml +62 -61
- data/web/locales/ur.yml +64 -64
- data/web/locales/vi.yml +67 -67
- data/web/locales/zh-cn.yml +43 -16
- data/web/locales/zh-tw.yml +42 -8
- data/web/views/_footer.erb +5 -2
- data/web/views/_job_info.erb +18 -2
- data/web/views/_metrics_period_select.erb +12 -0
- data/web/views/_nav.erb +1 -1
- data/web/views/_paging.erb +2 -0
- data/web/views/_poll_link.erb +1 -1
- data/web/views/_summary.erb +1 -1
- data/web/views/busy.erb +44 -28
- data/web/views/dashboard.erb +36 -4
- data/web/views/filtering.erb +7 -0
- data/web/views/metrics.erb +82 -0
- data/web/views/metrics_for_job.erb +68 -0
- data/web/views/morgue.erb +5 -9
- data/web/views/queue.erb +15 -15
- data/web/views/queues.erb +3 -1
- data/web/views/retries.erb +5 -9
- data/web/views/scheduled.erb +12 -13
- metadata +62 -31
- data/LICENSE +0 -9
- data/lib/generators/sidekiq/worker_generator.rb +0 -57
- data/lib/sidekiq/delay.rb +0 -41
- data/lib/sidekiq/exception_handler.rb +0 -27
- data/lib/sidekiq/extensions/action_mailer.rb +0 -48
- data/lib/sidekiq/extensions/active_record.rb +0 -43
- data/lib/sidekiq/extensions/class_methods.rb +0 -43
- data/lib/sidekiq/extensions/generic_proxy.rb +0 -33
- data/lib/sidekiq/worker.rb +0 -311
@@ -0,0 +1,127 @@
|
|
1
|
+
require "sidekiq/component"
|
2
|
+
|
3
|
+
module Sidekiq
|
4
|
+
# A Sidekiq::Capsule is the set of resources necessary to
|
5
|
+
# process one or more queues with a given concurrency.
|
6
|
+
# One "default" Capsule is started but the user may declare additional
|
7
|
+
# Capsules in their initializer.
|
8
|
+
#
|
9
|
+
# This capsule will pull jobs from the "single" queue and process
|
10
|
+
# the jobs with one thread, meaning the jobs will be processed serially.
|
11
|
+
#
|
12
|
+
# Sidekiq.configure_server do |config|
|
13
|
+
# config.capsule("single-threaded") do |cap|
|
14
|
+
# cap.concurrency = 1
|
15
|
+
# cap.queues = %w(single)
|
16
|
+
# end
|
17
|
+
# end
|
18
|
+
class Capsule
|
19
|
+
include Sidekiq::Component
|
20
|
+
|
21
|
+
attr_reader :name
|
22
|
+
attr_reader :queues
|
23
|
+
attr_accessor :concurrency
|
24
|
+
attr_reader :mode
|
25
|
+
attr_reader :weights
|
26
|
+
|
27
|
+
def initialize(name, config)
|
28
|
+
@name = name
|
29
|
+
@config = config
|
30
|
+
@queues = ["default"]
|
31
|
+
@weights = {"default" => 0}
|
32
|
+
@concurrency = config[:concurrency]
|
33
|
+
@mode = :strict
|
34
|
+
end
|
35
|
+
|
36
|
+
def fetcher
|
37
|
+
@fetcher ||= begin
|
38
|
+
inst = (config[:fetch_class] || Sidekiq::BasicFetch).new(self)
|
39
|
+
inst.setup(config[:fetch_setup]) if inst.respond_to?(:setup)
|
40
|
+
inst
|
41
|
+
end
|
42
|
+
end
|
43
|
+
|
44
|
+
def stop
|
45
|
+
fetcher&.bulk_requeue([])
|
46
|
+
end
|
47
|
+
|
48
|
+
# Sidekiq checks queues in three modes:
|
49
|
+
# - :strict - all queues have 0 weight and are checked strictly in order
|
50
|
+
# - :weighted - queues have arbitrary weight between 1 and N
|
51
|
+
# - :random - all queues have weight of 1
|
52
|
+
def queues=(val)
|
53
|
+
@weights = {}
|
54
|
+
@queues = Array(val).each_with_object([]) do |qstr, memo|
|
55
|
+
arr = qstr
|
56
|
+
arr = qstr.split(",") if qstr.is_a?(String)
|
57
|
+
name, weight = arr
|
58
|
+
@weights[name] = weight.to_i
|
59
|
+
[weight.to_i, 1].max.times do
|
60
|
+
memo << name
|
61
|
+
end
|
62
|
+
end
|
63
|
+
@mode = if @weights.values.all?(&:zero?)
|
64
|
+
:strict
|
65
|
+
elsif @weights.values.all? { |x| x == 1 }
|
66
|
+
:random
|
67
|
+
else
|
68
|
+
:weighted
|
69
|
+
end
|
70
|
+
end
|
71
|
+
|
72
|
+
# Allow the middleware to be different per-capsule.
|
73
|
+
# Avoid if possible and add middleware globally so all
|
74
|
+
# capsules share the same chains. Easier to debug that way.
|
75
|
+
def client_middleware
|
76
|
+
@client_chain ||= config.client_middleware.copy_for(self)
|
77
|
+
yield @client_chain if block_given?
|
78
|
+
@client_chain
|
79
|
+
end
|
80
|
+
|
81
|
+
def server_middleware
|
82
|
+
@server_chain ||= config.server_middleware.copy_for(self)
|
83
|
+
yield @server_chain if block_given?
|
84
|
+
@server_chain
|
85
|
+
end
|
86
|
+
|
87
|
+
def redis_pool
|
88
|
+
Thread.current[:sidekiq_redis_pool] || local_redis_pool
|
89
|
+
end
|
90
|
+
|
91
|
+
def local_redis_pool
|
92
|
+
# connection pool is lazy, it will not create connections unless you actually need them
|
93
|
+
# so don't be skimpy!
|
94
|
+
@redis ||= config.new_redis_pool(@concurrency, name)
|
95
|
+
end
|
96
|
+
|
97
|
+
def redis
|
98
|
+
raise ArgumentError, "requires a block" unless block_given?
|
99
|
+
redis_pool.with do |conn|
|
100
|
+
retryable = true
|
101
|
+
begin
|
102
|
+
yield conn
|
103
|
+
rescue RedisClientAdapter::BaseError => ex
|
104
|
+
# 2550 Failover can cause the server to become a replica, need
|
105
|
+
# to disconnect and reopen the socket to get back to the primary.
|
106
|
+
# 4495 Use the same logic if we have a "Not enough replicas" error from the primary
|
107
|
+
# 4985 Use the same logic when a blocking command is force-unblocked
|
108
|
+
# The same retry logic is also used in client.rb
|
109
|
+
if retryable && ex.message =~ /READONLY|NOREPLICAS|UNBLOCKED/
|
110
|
+
conn.close
|
111
|
+
retryable = false
|
112
|
+
retry
|
113
|
+
end
|
114
|
+
raise
|
115
|
+
end
|
116
|
+
end
|
117
|
+
end
|
118
|
+
|
119
|
+
def lookup(name)
|
120
|
+
config.lookup(name)
|
121
|
+
end
|
122
|
+
|
123
|
+
def logger
|
124
|
+
config.logger
|
125
|
+
end
|
126
|
+
end
|
127
|
+
end
|
data/lib/sidekiq/cli.rb
CHANGED
@@ -9,18 +9,23 @@ require "erb"
|
|
9
9
|
require "fileutils"
|
10
10
|
|
11
11
|
require "sidekiq"
|
12
|
+
require "sidekiq/config"
|
13
|
+
require "sidekiq/component"
|
14
|
+
require "sidekiq/capsule"
|
12
15
|
require "sidekiq/launcher"
|
13
|
-
require "sidekiq/util"
|
14
16
|
|
15
|
-
module Sidekiq
|
17
|
+
module Sidekiq # :nodoc:
|
16
18
|
class CLI
|
17
|
-
include
|
19
|
+
include Sidekiq::Component
|
18
20
|
include Singleton unless $TESTING
|
19
21
|
|
20
22
|
attr_accessor :launcher
|
21
23
|
attr_accessor :environment
|
24
|
+
attr_accessor :config
|
25
|
+
|
26
|
+
def parse(args = ARGV.dup)
|
27
|
+
@config ||= Sidekiq.default_configuration
|
22
28
|
|
23
|
-
def parse(args = ARGV)
|
24
29
|
setup_options(args)
|
25
30
|
initialize_logger
|
26
31
|
validate!
|
@@ -36,7 +41,7 @@ module Sidekiq
|
|
36
41
|
def run(boot_app: true)
|
37
42
|
boot_application if boot_app
|
38
43
|
|
39
|
-
if environment == "development" && $stdout.tty? &&
|
44
|
+
if environment == "development" && $stdout.tty? && @config.logger.formatter.is_a?(Sidekiq::Logger::Formatters::Pretty)
|
40
45
|
print_banner
|
41
46
|
end
|
42
47
|
logger.info "Booted Rails #{::Rails.version} application in #{environment} environment" if rails_app?
|
@@ -67,40 +72,41 @@ module Sidekiq
|
|
67
72
|
|
68
73
|
# touch the connection pool so it is created before we
|
69
74
|
# fire startup and start multithreading.
|
70
|
-
info =
|
71
|
-
ver = info["redis_version"]
|
72
|
-
raise "You are connecting to Redis
|
75
|
+
info = @config.redis_info
|
76
|
+
ver = Gem::Version.new(info["redis_version"])
|
77
|
+
raise "You are connecting to Redis #{ver}, Sidekiq requires Redis 6.2.0 or greater" if ver < Gem::Version.new("6.2.0")
|
73
78
|
|
74
79
|
maxmemory_policy = info["maxmemory_policy"]
|
75
|
-
if maxmemory_policy != "noeviction"
|
80
|
+
if maxmemory_policy != "noeviction" && maxmemory_policy != ""
|
81
|
+
# Redis Enterprise Cloud returns "" for their policy 😳
|
76
82
|
logger.warn <<~EOM
|
77
83
|
|
78
84
|
|
79
85
|
WARNING: Your Redis instance will evict Sidekiq data under heavy load.
|
80
86
|
The 'noeviction' maxmemory policy is recommended (current policy: '#{maxmemory_policy}').
|
81
|
-
See: https://github.com/
|
87
|
+
See: https://github.com/sidekiq/sidekiq/wiki/Using-Redis#memory
|
82
88
|
|
83
89
|
EOM
|
84
90
|
end
|
85
91
|
|
86
92
|
# Since the user can pass us a connection pool explicitly in the initializer, we
|
87
93
|
# need to verify the size is large enough or else Sidekiq's performance is dramatically slowed.
|
88
|
-
|
89
|
-
|
90
|
-
|
94
|
+
@config.capsules.each_pair do |name, cap|
|
95
|
+
raise ArgumentError, "Pool size too small for #{name}" if cap.redis_pool.size < cap.concurrency
|
96
|
+
end
|
91
97
|
|
92
98
|
# cache process identity
|
93
|
-
|
99
|
+
@config[:identity] = identity
|
94
100
|
|
95
101
|
# Touch middleware so it isn't lazy loaded by multiple threads, #3043
|
96
|
-
|
102
|
+
@config.server_middleware
|
97
103
|
|
98
104
|
# Before this point, the process is initializing with just the main thread.
|
99
105
|
# Starting here the process will now have multiple threads running.
|
100
106
|
fire_event(:startup, reverse: false, reraise: true)
|
101
107
|
|
102
|
-
logger.debug { "Client Middleware: #{
|
103
|
-
logger.debug { "Server Middleware: #{
|
108
|
+
logger.debug { "Client Middleware: #{@config.default_capsule.client_middleware.map(&:klass).join(", ")}" }
|
109
|
+
logger.debug { "Server Middleware: #{@config.default_capsule.server_middleware.map(&:klass).join(", ")}" }
|
104
110
|
|
105
111
|
launch(self_read)
|
106
112
|
end
|
@@ -110,13 +116,13 @@ module Sidekiq
|
|
110
116
|
logger.info "Starting processing, hit Ctrl-C to stop"
|
111
117
|
end
|
112
118
|
|
113
|
-
@launcher = Sidekiq::Launcher.new(
|
119
|
+
@launcher = Sidekiq::Launcher.new(@config)
|
114
120
|
|
115
121
|
begin
|
116
122
|
launcher.run
|
117
123
|
|
118
|
-
while
|
119
|
-
signal =
|
124
|
+
while self_read.wait_readable
|
125
|
+
signal = self_read.gets.strip
|
120
126
|
handle_signal(signal)
|
121
127
|
end
|
122
128
|
rescue Interrupt
|
@@ -133,19 +139,34 @@ module Sidekiq
|
|
133
139
|
end
|
134
140
|
end
|
135
141
|
|
136
|
-
|
137
|
-
|
142
|
+
HOLIDAY_COLORS = {
|
143
|
+
# got other color-specific holidays from around the world?
|
144
|
+
# https://developer-book.com/post/definitive-guide-for-colored-text-in-terminal/#256-color-escape-codes
|
145
|
+
"3-17" => "\e[1;32m", # St. Patrick's Day green
|
146
|
+
"10-31" => "\e[38;5;208m" # Halloween orange
|
147
|
+
}
|
148
|
+
|
149
|
+
def self.day
|
150
|
+
@@day ||= begin
|
151
|
+
t = Date.today
|
152
|
+
"#{t.month}-#{t.day}"
|
153
|
+
end
|
138
154
|
end
|
139
155
|
|
140
156
|
def self.r
|
141
|
-
"\e[31m"
|
157
|
+
@@r ||= HOLIDAY_COLORS[day] || "\e[1;31m"
|
142
158
|
end
|
143
159
|
|
144
160
|
def self.b
|
145
|
-
"\e[30m"
|
161
|
+
@@b ||= HOLIDAY_COLORS[day] || "\e[30m"
|
162
|
+
end
|
163
|
+
|
164
|
+
def self.w
|
165
|
+
"\e[1;37m"
|
146
166
|
end
|
147
167
|
|
148
168
|
def self.reset
|
169
|
+
@@b = @@r = @@day = nil
|
149
170
|
"\e[0m"
|
150
171
|
end
|
151
172
|
|
@@ -158,7 +179,7 @@ module Sidekiq
|
|
158
179
|
#{w} ,$$$$$b#{b}/#{w}md$$$P^'
|
159
180
|
#{w} .d$$$$$$#{b}/#{w}$$$P'
|
160
181
|
#{w} $$^' `"#{b}/#{w}$$$' #{r}____ _ _ _ _
|
161
|
-
#{w} $:
|
182
|
+
#{w} $: #{b}'#{w},$$: #{r} / ___|(_) __| | ___| | _(_) __ _
|
162
183
|
#{w} `b :$$ #{r} \\___ \\| |/ _` |/ _ \\ |/ / |/ _` |
|
163
184
|
#{w} $$: #{r} ___) | | (_| | __/ <| | (_| |
|
164
185
|
#{w} $$ #{r}|____/|_|\\__,_|\\___|_|\\_\\_|\\__, |
|
@@ -173,25 +194,25 @@ module Sidekiq
|
|
173
194
|
# Heroku sends TERM and then waits 30 seconds for process to exit.
|
174
195
|
"TERM" => ->(cli) { raise Interrupt },
|
175
196
|
"TSTP" => ->(cli) {
|
176
|
-
|
197
|
+
cli.logger.info "Received TSTP, no longer accepting new work"
|
177
198
|
cli.launcher.quiet
|
178
199
|
},
|
179
200
|
"TTIN" => ->(cli) {
|
180
201
|
Thread.list.each do |thread|
|
181
|
-
|
202
|
+
cli.logger.warn "Thread TID-#{(thread.object_id ^ ::Process.pid).to_s(36)} #{thread.name}"
|
182
203
|
if thread.backtrace
|
183
|
-
|
204
|
+
cli.logger.warn thread.backtrace.join("\n")
|
184
205
|
else
|
185
|
-
|
206
|
+
cli.logger.warn "<no backtrace available>"
|
186
207
|
end
|
187
208
|
end
|
188
209
|
}
|
189
210
|
}
|
190
|
-
UNHANDLED_SIGNAL_HANDLER = ->(cli) {
|
211
|
+
UNHANDLED_SIGNAL_HANDLER = ->(cli) { cli.logger.info "No signal handler registered, ignoring" }
|
191
212
|
SIGNAL_HANDLERS.default = UNHANDLED_SIGNAL_HANDLER
|
192
213
|
|
193
214
|
def handle_signal(sig)
|
194
|
-
|
215
|
+
logger.debug "Got #{sig} signal"
|
195
216
|
SIGNAL_HANDLERS[sig].call(self)
|
196
217
|
end
|
197
218
|
|
@@ -209,6 +230,7 @@ module Sidekiq
|
|
209
230
|
# Both Sinatra 2.0+ and Sidekiq support this term.
|
210
231
|
# RAILS_ENV and RACK_ENV are there for legacy support.
|
211
232
|
@environment = cli_env || ENV["APP_ENV"] || ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
|
233
|
+
config[:environment] = @environment
|
212
234
|
end
|
213
235
|
|
214
236
|
def symbolize_keys_deep!(hash)
|
@@ -237,7 +259,7 @@ module Sidekiq
|
|
237
259
|
config_dir = if File.directory?(opts[:require].to_s)
|
238
260
|
File.join(opts[:require], "config")
|
239
261
|
else
|
240
|
-
File.join(
|
262
|
+
File.join(@config[:require], "config")
|
241
263
|
end
|
242
264
|
|
243
265
|
%w[sidekiq.yml sidekiq.yml.erb].each do |config_file|
|
@@ -254,27 +276,34 @@ module Sidekiq
|
|
254
276
|
opts[:concurrency] = Integer(ENV["RAILS_MAX_THREADS"]) if opts[:concurrency].nil? && ENV["RAILS_MAX_THREADS"]
|
255
277
|
|
256
278
|
# merge with defaults
|
257
|
-
|
258
|
-
end
|
279
|
+
@config.merge!(opts)
|
259
280
|
|
260
|
-
|
261
|
-
|
281
|
+
@config.default_capsule.tap do |cap|
|
282
|
+
cap.queues = opts[:queues]
|
283
|
+
cap.concurrency = opts[:concurrency] || @config[:concurrency]
|
284
|
+
end
|
285
|
+
|
286
|
+
opts[:capsules]&.each do |name, cap_config|
|
287
|
+
@config.capsule(name.to_s) do |cap|
|
288
|
+
cap.queues = cap_config[:queues]
|
289
|
+
cap.concurrency = cap_config[:concurrency]
|
290
|
+
end
|
291
|
+
end
|
262
292
|
end
|
263
293
|
|
264
294
|
def boot_application
|
265
295
|
ENV["RACK_ENV"] = ENV["RAILS_ENV"] = environment
|
266
296
|
|
267
|
-
if File.directory?(
|
297
|
+
if File.directory?(@config[:require])
|
268
298
|
require "rails"
|
269
|
-
if ::Rails::VERSION::MAJOR <
|
270
|
-
|
271
|
-
else
|
272
|
-
require "sidekiq/rails"
|
273
|
-
require File.expand_path("#{options[:require]}/config/environment.rb")
|
299
|
+
if ::Rails::VERSION::MAJOR < 6
|
300
|
+
warn "Sidekiq #{Sidekiq::VERSION} only supports Rails 6+"
|
274
301
|
end
|
275
|
-
|
302
|
+
require "sidekiq/rails"
|
303
|
+
require File.expand_path("#{@config[:require]}/config/environment.rb")
|
304
|
+
@config[:tag] ||= default_tag
|
276
305
|
else
|
277
|
-
require
|
306
|
+
require @config[:require]
|
278
307
|
end
|
279
308
|
end
|
280
309
|
|
@@ -291,18 +320,18 @@ module Sidekiq
|
|
291
320
|
end
|
292
321
|
|
293
322
|
def validate!
|
294
|
-
if !File.exist?(
|
295
|
-
(File.directory?(
|
323
|
+
if !File.exist?(@config[:require]) ||
|
324
|
+
(File.directory?(@config[:require]) && !File.exist?("#{@config[:require]}/config/application.rb"))
|
296
325
|
logger.info "=================================================================="
|
297
326
|
logger.info " Please point Sidekiq to a Rails application or a Ruby file "
|
298
|
-
logger.info " to load your
|
327
|
+
logger.info " to load your job classes with -r [DIR|FILE]."
|
299
328
|
logger.info "=================================================================="
|
300
329
|
logger.info @parser
|
301
330
|
die(1)
|
302
331
|
end
|
303
332
|
|
304
333
|
[:concurrency, :timeout].each do |opt|
|
305
|
-
raise ArgumentError, "#{opt}: #{
|
334
|
+
raise ArgumentError, "#{opt}: #{@config[opt]} is not a valid value" if @config[opt].to_i <= 0
|
306
335
|
end
|
307
336
|
end
|
308
337
|
|
@@ -319,10 +348,6 @@ module Sidekiq
|
|
319
348
|
opts[:concurrency] = Integer(arg)
|
320
349
|
end
|
321
350
|
|
322
|
-
o.on "-d", "--daemon", "Daemonize process" do |arg|
|
323
|
-
puts "ERROR: Daemonization mode was removed in Sidekiq 6.0, please use a proper process supervisor to start and manage your services"
|
324
|
-
end
|
325
|
-
|
326
351
|
o.on "-e", "--environment ENV", "Application environment" do |arg|
|
327
352
|
opts[:environment] = arg
|
328
353
|
end
|
@@ -332,11 +357,11 @@ module Sidekiq
|
|
332
357
|
end
|
333
358
|
|
334
359
|
o.on "-q", "--queue QUEUE[,WEIGHT]", "Queues to process with optional weights" do |arg|
|
335
|
-
|
336
|
-
|
360
|
+
opts[:queues] ||= []
|
361
|
+
opts[:queues] << arg
|
337
362
|
end
|
338
363
|
|
339
|
-
o.on "-r", "--require [PATH|DIR]", "Location of Rails application with
|
364
|
+
o.on "-r", "--require [PATH|DIR]", "Location of Rails application with jobs or file to require" do |arg|
|
340
365
|
opts[:require] = arg
|
341
366
|
end
|
342
367
|
|
@@ -352,15 +377,7 @@ module Sidekiq
|
|
352
377
|
opts[:config_file] = arg
|
353
378
|
end
|
354
379
|
|
355
|
-
o.on "-
|
356
|
-
puts "ERROR: Logfile redirection was removed in Sidekiq 6.0, Sidekiq will only log to STDOUT"
|
357
|
-
end
|
358
|
-
|
359
|
-
o.on "-P", "--pidfile PATH", "path to pidfile" do |arg|
|
360
|
-
puts "ERROR: PID file creation was removed in Sidekiq 6.0, please use a proper process supervisor to start and manage your services"
|
361
|
-
end
|
362
|
-
|
363
|
-
o.on "-V", "--version", "Print version and exit" do |arg|
|
380
|
+
o.on "-V", "--version", "Print version and exit" do
|
364
381
|
puts "Sidekiq #{Sidekiq::VERSION}"
|
365
382
|
die(0)
|
366
383
|
end
|
@@ -376,11 +393,13 @@ module Sidekiq
|
|
376
393
|
end
|
377
394
|
|
378
395
|
def initialize_logger
|
379
|
-
|
396
|
+
@config.logger.level = ::Logger::DEBUG if @config[:verbose]
|
380
397
|
end
|
381
398
|
|
382
399
|
def parse_config(path)
|
383
|
-
|
400
|
+
erb = ERB.new(File.read(path), trim_mode: "-")
|
401
|
+
erb.filename = File.expand_path(path)
|
402
|
+
opts = YAML.safe_load(erb.result, permitted_classes: [Symbol], aliases: true) || {}
|
384
403
|
|
385
404
|
if opts.respond_to? :deep_symbolize_keys!
|
386
405
|
opts.deep_symbolize_keys!
|
@@ -391,23 +410,9 @@ module Sidekiq
|
|
391
410
|
opts = opts.merge(opts.delete(environment.to_sym) || {})
|
392
411
|
opts.delete(:strict)
|
393
412
|
|
394
|
-
parse_queues(opts, opts.delete(:queues) || [])
|
395
|
-
|
396
413
|
opts
|
397
414
|
end
|
398
415
|
|
399
|
-
def parse_queues(opts, queues_and_weights)
|
400
|
-
queues_and_weights.each { |queue_and_weight| parse_queue(opts, *queue_and_weight) }
|
401
|
-
end
|
402
|
-
|
403
|
-
def parse_queue(opts, queue, weight = nil)
|
404
|
-
opts[:queues] ||= []
|
405
|
-
opts[:strict] = true if opts[:strict].nil?
|
406
|
-
raise ArgumentError, "queues: #{queue} cannot be defined twice" if opts[:queues].include?(queue)
|
407
|
-
[weight.to_i, 1].max.times { opts[:queues] << queue.to_s }
|
408
|
-
opts[:strict] = false if weight.to_i > 0
|
409
|
-
end
|
410
|
-
|
411
416
|
def rails_app?
|
412
417
|
defined?(::Rails) && ::Rails.respond_to?(:application)
|
413
418
|
end
|
@@ -415,3 +420,4 @@ module Sidekiq
|
|
415
420
|
end
|
416
421
|
|
417
422
|
require "sidekiq/systemd"
|
423
|
+
require "sidekiq/metrics/tracking"
|