sidekiq 5.2.8 → 6.2.2

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.

Files changed (97) hide show
  1. checksums.yaml +4 -4
  2. data/Changes.md +248 -0
  3. data/LICENSE +1 -1
  4. data/README.md +18 -34
  5. data/bin/sidekiq +26 -2
  6. data/bin/sidekiqload +32 -24
  7. data/bin/sidekiqmon +8 -0
  8. data/lib/generators/sidekiq/templates/worker_test.rb.erb +1 -1
  9. data/lib/generators/sidekiq/worker_generator.rb +21 -13
  10. data/lib/sidekiq/api.rb +310 -249
  11. data/lib/sidekiq/cli.rb +144 -180
  12. data/lib/sidekiq/client.rb +64 -48
  13. data/lib/sidekiq/delay.rb +5 -6
  14. data/lib/sidekiq/exception_handler.rb +10 -12
  15. data/lib/sidekiq/extensions/action_mailer.rb +13 -22
  16. data/lib/sidekiq/extensions/active_record.rb +13 -10
  17. data/lib/sidekiq/extensions/class_methods.rb +14 -11
  18. data/lib/sidekiq/extensions/generic_proxy.rb +6 -4
  19. data/lib/sidekiq/fetch.rb +38 -31
  20. data/lib/sidekiq/job.rb +8 -0
  21. data/lib/sidekiq/job_logger.rb +45 -7
  22. data/lib/sidekiq/job_retry.rb +64 -67
  23. data/lib/sidekiq/launcher.rb +146 -60
  24. data/lib/sidekiq/logger.rb +166 -0
  25. data/lib/sidekiq/manager.rb +11 -13
  26. data/lib/sidekiq/middleware/chain.rb +20 -8
  27. data/lib/sidekiq/middleware/i18n.rb +5 -7
  28. data/lib/sidekiq/monitor.rb +133 -0
  29. data/lib/sidekiq/paginator.rb +18 -14
  30. data/lib/sidekiq/processor.rb +71 -70
  31. data/lib/sidekiq/rails.rb +29 -37
  32. data/lib/sidekiq/redis_connection.rb +50 -48
  33. data/lib/sidekiq/scheduled.rb +35 -30
  34. data/lib/sidekiq/sd_notify.rb +149 -0
  35. data/lib/sidekiq/systemd.rb +24 -0
  36. data/lib/sidekiq/testing/inline.rb +2 -1
  37. data/lib/sidekiq/testing.rb +36 -27
  38. data/lib/sidekiq/util.rb +45 -16
  39. data/lib/sidekiq/version.rb +2 -1
  40. data/lib/sidekiq/web/action.rb +15 -11
  41. data/lib/sidekiq/web/application.rb +86 -76
  42. data/lib/sidekiq/web/csrf_protection.rb +180 -0
  43. data/lib/sidekiq/web/helpers.rb +114 -86
  44. data/lib/sidekiq/web/router.rb +23 -19
  45. data/lib/sidekiq/web.rb +61 -105
  46. data/lib/sidekiq/worker.rb +126 -102
  47. data/lib/sidekiq.rb +69 -44
  48. data/sidekiq.gemspec +23 -16
  49. data/web/assets/images/apple-touch-icon.png +0 -0
  50. data/web/assets/javascripts/application.js +25 -27
  51. data/web/assets/javascripts/dashboard.js +4 -23
  52. data/web/assets/stylesheets/application-dark.css +147 -0
  53. data/web/assets/stylesheets/application.css +37 -128
  54. data/web/locales/ar.yml +8 -2
  55. data/web/locales/de.yml +14 -2
  56. data/web/locales/en.yml +5 -0
  57. data/web/locales/es.yml +18 -2
  58. data/web/locales/fr.yml +10 -3
  59. data/web/locales/ja.yml +7 -1
  60. data/web/locales/lt.yml +83 -0
  61. data/web/locales/pl.yml +4 -4
  62. data/web/locales/ru.yml +4 -0
  63. data/web/locales/vi.yml +83 -0
  64. data/web/views/_job_info.erb +3 -2
  65. data/web/views/busy.erb +54 -20
  66. data/web/views/dashboard.erb +14 -6
  67. data/web/views/dead.erb +3 -3
  68. data/web/views/layout.erb +2 -0
  69. data/web/views/morgue.erb +9 -6
  70. data/web/views/queue.erb +11 -2
  71. data/web/views/queues.erb +10 -2
  72. data/web/views/retries.erb +11 -8
  73. data/web/views/retry.erb +3 -3
  74. data/web/views/scheduled.erb +5 -2
  75. metadata +32 -64
  76. data/.circleci/config.yml +0 -61
  77. data/.github/contributing.md +0 -32
  78. data/.github/issue_template.md +0 -11
  79. data/.gitignore +0 -15
  80. data/.travis.yml +0 -11
  81. data/3.0-Upgrade.md +0 -70
  82. data/4.0-Upgrade.md +0 -53
  83. data/5.0-Upgrade.md +0 -56
  84. data/COMM-LICENSE +0 -97
  85. data/Ent-Changes.md +0 -238
  86. data/Gemfile +0 -23
  87. data/Pro-2.0-Upgrade.md +0 -138
  88. data/Pro-3.0-Upgrade.md +0 -44
  89. data/Pro-4.0-Upgrade.md +0 -35
  90. data/Pro-Changes.md +0 -759
  91. data/Rakefile +0 -9
  92. data/bin/sidekiqctl +0 -20
  93. data/code_of_conduct.md +0 -50
  94. data/lib/sidekiq/core_ext.rb +0 -1
  95. data/lib/sidekiq/ctl.rb +0 -221
  96. data/lib/sidekiq/logging.rb +0 -122
  97. data/lib/sidekiq/middleware/server/active_record.rb +0 -23
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 736ce0e629bd4a115422342ccb49c3cf8199372ced62e0bb0a9463974d2cb6cd
4
- data.tar.gz: 60857bf5d87f618ece94183f4553636ae6221f567ada9489da82bbbbd88e0930
3
+ metadata.gz: 1b0da541124d097e05936cc860a93009ba170d714cbd8dbc760c1245818e8ed7
4
+ data.tar.gz: 63995ccbb57fa16e4954cda4ab9610506b0a8ff35084492b520fc18608face35
5
5
  SHA512:
6
- metadata.gz: 363885cb52ed06abe653a9fbb6627e9931064fc7d3c607d605a2c915ff2e2ef236c1afd15d22e29a2ee11807f9682fd404c324a24fcd0163637a89f7b0d97458
7
- data.tar.gz: b772dbcd3a911a7a2e48cc75c51f996e59aeca84372188f14972ded218c56a11457e0b3fbd715f28f4c5a2e5b88ededf0ece59933a2e5a2cdb64815d96a02c06
6
+ metadata.gz: f3b864db74530840437c0af43475ed0e12a876d6d2cbbd808ecc72722adddbd8d5548c9b777d4e34af5deddf94871567717518f70d787ea7f6a089f2f5b2f4ed
7
+ data.tar.gz: 4569eed5baa10134e99a0b1404c213e3b35c08ec158e2fa8b006918298750919e8d34074aa10d3b4dfb621bb18cbe68be467d1e7822fb855012cff0f64dcdc7b
data/Changes.md CHANGED
@@ -2,6 +2,254 @@
2
2
 
3
3
  [Sidekiq Changes](https://github.com/mperham/sidekiq/blob/master/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/master/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/master/Ent-Changes.md)
4
4
 
5
+ 6.2.2
6
+ ---------
7
+
8
+ - Reduce retry jitter, add jitter to `sidekiq_retry_in` values [#4957]
9
+ - Minimize scheduler load on Redis at scale [#4882]
10
+ - Improve logging of delay jobs [#4904, BuonOno]
11
+ - Minor CSS improvements for buttons and tables, design PRs always welcome!
12
+ - Tweak Web UI `Cache-Control` header [#4966]
13
+ - Rename internal API class `Sidekiq::Job` to `Sidekiq::JobRecord` [#4955]
14
+
15
+ 6.2.1
16
+ ---------
17
+
18
+ - Update RTT warning logic to handle transient RTT spikes [#4851]
19
+ - Fix very low priority CVE on unescaped queue name [#4852]
20
+ - Add note about sessions and Rails apps in API mode
21
+
22
+ 6.2.0
23
+ ---------
24
+
25
+ - Store Redis RTT and log if poor [#4824]
26
+ - Add process/thread stats to Busy page [#4806]
27
+ - Improve Web UI on mobile devices [#4840]
28
+ - **Refactor Web UI session usage** [#4804]
29
+ Numerous people have hit "Forbidden" errors and struggled with Sidekiq's
30
+ Web UI session requirement. If you have code in your initializer for
31
+ Web sessions, it's quite possible it will need to be removed. Here's
32
+ an overview:
33
+ ```
34
+ Sidekiq::Web needs a valid Rack session for CSRF protection. If this is a Rails app,
35
+ make sure you mount Sidekiq::Web *inside* your routes in `config/routes.rb` so
36
+ Sidekiq can reuse the Rails session:
37
+
38
+ Rails.application.routes.draw do
39
+ mount Sidekiq::Web => "/sidekiq"
40
+ ....
41
+ end
42
+
43
+ If this is a bare Rack app, use a session middleware before Sidekiq::Web:
44
+
45
+ # first, use IRB to create a shared secret key for sessions and commit it
46
+ require 'securerandom'; File.open(".session.key", "w") {|f| f.write(SecureRandom.hex(32)) }
47
+
48
+ # now, update your Rack app to include the secret with a session cookie middleware
49
+ use Rack::Session::Cookie, secret: File.read(".session.key"), same_site: true, max_age: 86400
50
+ run Sidekiq::Web
51
+
52
+ If this is a Rails app in API mode, you need to enable sessions.
53
+
54
+ https://guides.rubyonrails.org/api_app.html#using-session-middlewares
55
+ ```
56
+
57
+ 6.1.3
58
+ ---------
59
+
60
+ - Warn if Redis is configured to evict data under memory pressure [#4752]
61
+ - Add process RSS on the Busy page [#4717]
62
+
63
+ 6.1.2
64
+ ---------
65
+
66
+ - Improve readability in dark mode Web UI [#4674]
67
+ - Fix Web UI crash with corrupt session [#4672]
68
+ - Allow middleware to yield arguments [#4673, @eugeneius]
69
+ - Migrate CI from CircleCI to GitHub Actions [#4677]
70
+
71
+ 6.1.1
72
+ ---------
73
+
74
+ - Jobs are now sorted by age in the Busy Workers table. [#4641]
75
+ - Fix "check all" JS logic in Web UI [#4619]
76
+
77
+ 6.1.0
78
+ ---------
79
+
80
+ - Web UI - Dark Mode fixes [#4543, natematykiewicz]
81
+ - Ensure `Rack::ContentLength` is loaded as middleware for correct Web UI responses [#4541]
82
+ - Avoid exception dumping SSL store in Redis connection logging [#4532]
83
+ - Better error messages in Sidekiq::Client [#4549]
84
+ - Remove rack-protection, reimplement CSRF protection [#4588]
85
+ - Require redis-rb 4.2 [#4591]
86
+ - Update to jquery 1.12.4 [#4593]
87
+ - Refactor internal fetch logic and API [#4602]
88
+
89
+ 6.0.7
90
+ ---------
91
+
92
+ - Refactor systemd integration to work better with custom binaries [#4511]
93
+ - Don't connect to Redis at process exit if not needed [#4502]
94
+ - Remove Redis connection naming [#4479]
95
+ - Fix Redis Sentinel password redaction [#4499]
96
+ - Add Vietnamese locale (vi) [#4528]
97
+
98
+ 6.0.6
99
+ ---------
100
+
101
+ - **Integrate with systemd's watchdog and notification features** [#4488]
102
+ Set `Type=notify` in [sidekiq.service](https://github.com/mperham/sidekiq/blob/4b8a8bd3ae42f6e48ae1fdaf95ed7d7af18ed8bb/examples/systemd/sidekiq.service#L30-L39). The integration works automatically.
103
+ - Use `setTimeout` rather than `setInterval` to avoid thundering herd [#4480]
104
+ - Fix edge case where a job can be pushed without a queue.
105
+ - Flush job stats at exit [#4498]
106
+ - Check RAILS_ENV before RACK_ENV [#4493]
107
+ - Add Lithuanian locale [#4476]
108
+
109
+ 6.0.5
110
+ ---------
111
+
112
+ - Fix broken Web UI response when using NewRelic and Rack 2.1.2+. [#4440]
113
+ - Update APIs to use `UNLINK`, not `DEL`. [#4449]
114
+ - Fix Ruby 2.7 warnings [#4412]
115
+ - Add support for `APP_ENV` [[95fa5d9]](https://github.com/mperham/sidekiq/commit/95fa5d90192148026e52ca2902f1b83c70858ce8)
116
+
117
+ 6.0.4
118
+ ---------
119
+
120
+ - Fix ActiveJob's `sidekiq_options` integration [#4404]
121
+ - Sidekiq Pro users will now see a Pause button next to each queue in
122
+ the Web UI, allowing them to pause queues manually [#4374, shayonj]
123
+ - Fix Sidekiq::Workers API unintentional change in 6.0.2 [#4387]
124
+
125
+
126
+ 6.0.3
127
+ ---------
128
+
129
+ - Fix `Sidekiq::Client.push_bulk` API which was erroneously putting
130
+ invalid `at` values in the job payloads [#4321]
131
+
132
+ 6.0.2
133
+ ---------
134
+
135
+ - Fix Sidekiq Enterprise's rolling restart functionality, broken by refactoring in 6.0.0. [#4334]
136
+ - More internal refactoring and performance tuning [fatkodima]
137
+
138
+ 6.0.1
139
+ ---------
140
+
141
+ - **Performance tuning**, Sidekiq should be 10-15% faster now [#4303, 4299,
142
+ 4269, fatkodima]
143
+ - **Dark Mode support in Web UI** (further design polish welcome!) [#4227, mperham,
144
+ fatkodima, silent-e]
145
+ - **Job-specific log levels**, allowing you to turn on debugging for
146
+ problematic workers. [fatkodima, #4287]
147
+ ```ruby
148
+ MyWorker.set(log_level: :debug).perform_async(...)
149
+ ```
150
+ - **Ad-hoc job tags**. You can tag your jobs with, e.g, subdomain, tenant, country,
151
+ locale, application, version, user/client, "alpha/beta/pro/ent", types of jobs,
152
+ teams/people responsible for jobs, additional metadata, etc.
153
+ Tags are shown on different pages with job listings. Sidekiq Pro users
154
+ can filter based on them [fatkodima, #4280]
155
+ ```ruby
156
+ class MyWorker
157
+ include Sidekiq::Worker
158
+ sidekiq_options tags: ['bank-ops', 'alpha']
159
+ ...
160
+ end
161
+ ```
162
+ - Fetch scheduled jobs in batches before pushing into specific queues.
163
+ This will decrease enqueueing time of scheduled jobs by a third. [fatkodima, #4273]
164
+ ```
165
+ ScheduledSet with 10,000 jobs
166
+ Before: 56.6 seconds
167
+ After: 39.2 seconds
168
+ ```
169
+ - Compress error backtraces before pushing into Redis, if you are
170
+ storing error backtraces, this will halve the size of your RetrySet
171
+ in Redis [fatkodima, #4272]
172
+ ```
173
+ RetrySet with 100,000 jobs
174
+ Before: 261 MB
175
+ After: 129 MB
176
+ ```
177
+ - Support display of ActiveJob 6.0 payloads in the Web UI [#4263]
178
+ - Add `SortedSet#scan` for pattern based scanning. For large sets this API will be **MUCH** faster
179
+ than standard iteration using each. [fatkodima, #4262]
180
+ ```ruby
181
+ Sidekiq::DeadSet.new.scan("UnreliableApi") do |job|
182
+ job.retry
183
+ end
184
+ ```
185
+ - Dramatically speed up SortedSet#find\_job(jid) by using Redis's ZSCAN
186
+ support, approx 10x faster. [fatkodima, #4259]
187
+ ```
188
+ zscan 0.179366 0.047727 0.227093 ( 1.161376)
189
+ enum 8.522311 0.419826 8.942137 ( 9.785079)
190
+ ```
191
+ - Respect rails' generators `test_framework` option and gracefully handle extra `worker` suffix on generator [fatkodima, #4256]
192
+ - Add ability to sort 'Enqueued' page on Web UI by position in the queue [fatkodima, #4248]
193
+ - Support `Client.push_bulk` with different delays [fatkodima, #4243]
194
+ ```ruby
195
+ Sidekiq::Client.push_bulk("class" => FooJob, "args" => [[1], [2]], "at" => [1.minute.from_now.to_f, 5.minutes.from_now.to_f])
196
+ ```
197
+ - Easier way to test enqueuing specific ActionMailer and ActiveRecord delayed jobs. Instead of manually
198
+ parsing embedded class, you can now test by fetching jobs for specific classes. [fatkodima, #4292]
199
+ ```ruby
200
+ assert_equal 1, Sidekiq::Extensions::DelayedMailer.jobs_for(FooMailer).size
201
+ ```
202
+ - Add `sidekiqmon` to gemspec executables [#4242]
203
+ - Gracefully handle `Sidekiq.logger = nil` [#4240]
204
+ - Inject Sidekiq::LogContext module if user-supplied logger does not include it [#4239]
205
+
206
+ 6.0
207
+ ---------
208
+
209
+ This release has major breaking changes. Read and test carefully in production.
210
+
211
+ - With Rails 6.0.2+, ActiveJobs can now use `sidekiq_options` directly to configure Sidekiq
212
+ features/internals like the retry subsystem. [#4213, pirj]
213
+ ```ruby
214
+ class MyJob < ActiveJob::Base
215
+ queue_as :myqueue
216
+ sidekiq_options retry: 10, backtrace: 20
217
+ def perform(...)
218
+ end
219
+ end
220
+ ```
221
+ - Logging has been redesigned to allow for pluggable log formatters:
222
+ ```ruby
223
+ Sidekiq.configure_server do |config|
224
+ config.log_formatter = Sidekiq::Logger::Formatters::JSON.new
225
+ end
226
+ ```
227
+ See the [Logging wiki page](https://github.com/mperham/sidekiq/wiki/Logging) for more details.
228
+ - **BREAKING CHANGE** Validate proper usage of the `REDIS_PROVIDER`
229
+ variable. This variable is meant to hold the name of the environment
230
+ variable which contains your Redis URL, so that you can switch Redis
231
+ providers quickly and easily with a single variable change. It is not
232
+ meant to hold the actual Redis URL itself. If you want to manually set
233
+ the Redis URL (not recommended as it implies you have no failover),
234
+ then you may set `REDIS_URL` directly. [#3969]
235
+ - **BREAKING CHANGE** Increase default shutdown timeout from 8 seconds
236
+ to 25 seconds. Both Heroku and ECS now use 30 second shutdown timeout
237
+ by default and we want Sidekiq to take advantage of this time. If you
238
+ have deployment scripts which depend on the old default timeout, use `-t 8` to
239
+ get the old behavior. [#3968]
240
+ - **BREAKING CHANGE** Remove the daemonization, logfile and pidfile
241
+ arguments to Sidekiq. Use a proper process supervisor (e.g. systemd or
242
+ foreman) to manage Sidekiq. See the Deployment wiki page for links to
243
+ more resources.
244
+ - Integrate the StandardRB code formatter to ensure consistent code
245
+ styling. [#4114, gearnode]
246
+
247
+ 5.2.9
248
+ ---------
249
+
250
+ - Release Rack lock due to a cascade of CVEs. [#4566]
251
+ Pro-tip: don't lock Rack.
252
+
5
253
  5.2.8
6
254
  ---------
7
255
 
data/LICENSE CHANGED
@@ -6,4 +6,4 @@ for license text.
6
6
 
7
7
  Sidekiq Pro has a commercial-friendly license allowing private forks
8
8
  and modifications of Sidekiq. Please see https://sidekiq.org/products/pro.html for
9
- more detail. You can find the commercial license terms in COMM-LICENSE.
9
+ more detail. You can find the commercial license terms in COMM-LICENSE.txt.
data/README.md CHANGED
@@ -2,10 +2,7 @@ Sidekiq
2
2
  ==============
3
3
 
4
4
  [![Gem Version](https://badge.fury.io/rb/sidekiq.svg)](https://rubygems.org/gems/sidekiq)
5
- [![Code Climate](https://codeclimate.com/github/mperham/sidekiq.svg)](https://codeclimate.com/github/mperham/sidekiq)
6
- [![Build Status](https://circleci.com/gh/mperham/sidekiq/tree/master.svg?style=svg)](https://circleci.com/gh/mperham/sidekiq/tree/master)
7
- [![Gitter Chat](https://badges.gitter.im/mperham/sidekiq.svg)](https://gitter.im/mperham/sidekiq)
8
-
5
+ ![Build](https://github.com/mperham/sidekiq/workflows/CI/badge.svg)
9
6
 
10
7
  Simple, efficient background processing for Ruby.
11
8
 
@@ -13,32 +10,27 @@ Sidekiq uses threads to handle many jobs at the same time in the
13
10
  same process. It does not require Rails but will integrate tightly with
14
11
  Rails to make background processing dead simple.
15
12
 
16
- Sidekiq is compatible with Resque. It uses the exact same
17
- message format as Resque so it can integrate into an existing Resque processing farm.
18
- You can have Sidekiq and Resque run side-by-side at the same time and
19
- use the Resque client to enqueue jobs in Redis to be processed by Sidekiq.
20
-
21
13
  Performance
22
14
  ---------------
23
15
 
24
- Version | Latency | Garbage created for 10,000 jobs | Time to process 100,000 jobs | Throughput
25
- -----------------|------|---------|---------|------------------------
26
- Sidekiq 4.0.0 | 10ms | 151 MB | 22 sec | **4500 jobs/sec**
27
- Sidekiq 3.5.1 | 22ms | 1257 MB | 125 sec | 800 jobs/sec
28
- Resque 1.25.2 | - | - | 420 sec | 240 jobs/sec
29
- DelayedJob 4.1.1 | - | - | 465 sec | 215 jobs/sec
16
+ Version | Latency | Garbage created for 10k jobs | Time to process 100k jobs | Throughput | Ruby
17
+ -----------------|------|---------|---------|------------------------|-----
18
+ Sidekiq 6.0.2 | 3 ms | 156 MB | 14.0 sec| **7100 jobs/sec** | MRI 2.6.3
19
+ Sidekiq 6.0.0 | 3 ms | 156 MB | 19 sec | 5200 jobs/sec | MRI 2.6.3
20
+ Sidekiq 4.0.0 | 10 ms | 151 MB | 22 sec | 4500 jobs/sec |
21
+ Sidekiq 3.5.1 | 22 ms | 1257 MB | 125 sec | 800 jobs/sec |
22
+ Resque 1.25.2 | - | - | 420 sec | 240 jobs/sec |
23
+ DelayedJob 4.1.1 | - | - | 465 sec | 215 jobs/sec |
30
24
 
31
- <small>This benchmark can be found in `bin/sidekiqload`.</small>
25
+ This benchmark can be found in `bin/sidekiqload` and assumes a Redis network latency of 1ms.
32
26
 
33
27
  Requirements
34
28
  -----------------
35
29
 
36
- Sidekiq supports CRuby 2.2.2+ and JRuby 9k.
30
+ - Redis: 4.0+
31
+ - Ruby: MRI 2.5+ or JRuby 9.2+.
37
32
 
38
- All Rails releases >= 4.0 are officially supported.
39
-
40
- Redis 2.8 or greater is required. 3.0.3+ is recommended for large
41
- installations with thousands of worker threads.
33
+ Sidekiq 6.0 supports Rails 5.0+ but does not require it.
42
34
 
43
35
 
44
36
  Installation
@@ -63,7 +55,7 @@ Want to Upgrade?
63
55
  I also sell Sidekiq Pro and Sidekiq Enterprise, extensions to Sidekiq which provide more
64
56
  features, a commercial-friendly license and allow you to support high
65
57
  quality open source development all at the same time. Please see the
66
- [Sidekiq](http://sidekiq.org/) homepage for more detail.
58
+ [Sidekiq](https://sidekiq.org/) homepage for more detail.
67
59
 
68
60
  Subscribe to the **[quarterly newsletter](https://tinyletter.com/sidekiq)** to stay informed about the latest
69
61
  features and changes to Sidekiq and its bigger siblings.
@@ -77,24 +69,16 @@ Problems?
77
69
  If you have a problem, please review the [FAQ](https://github.com/mperham/sidekiq/wiki/FAQ) and [Troubleshooting](https://github.com/mperham/sidekiq/wiki/Problems-and-Troubleshooting) wiki pages.
78
70
  Searching the [issues](https://github.com/mperham/sidekiq/issues) for your problem is also a good idea.
79
71
 
80
- Sidekiq Pro and Sidekiq Enterprise customers get private email support. You can purchase at http://sidekiq.org; email support@contribsys.com for help.
72
+ Sidekiq Pro and Sidekiq Enterprise customers get private email support. You can purchase at https://sidekiq.org; email support@contribsys.com for help.
81
73
 
82
74
  Useful resources:
83
75
 
84
76
  * Product documentation is in the [wiki](https://github.com/mperham/sidekiq/wiki).
85
- * Release announcements are made to the [@sidekiq](https://twitter.com/sidekiq) Twitter account.
77
+ * Occasional announcements are made to the [@sidekiq](https://twitter.com/sidekiq) Twitter account.
86
78
  * The [Sidekiq tag](https://stackoverflow.com/questions/tagged/sidekiq) on Stack Overflow has lots of useful Q &amp; A.
87
79
 
88
- **No support via Twitter**
89
-
90
80
  Every Friday morning is Sidekiq happy hour: I video chat and answer questions.
91
- See the [Sidekiq support page](http://sidekiq.org/support.html) for details.
92
-
93
- Thanks
94
- -----------------
95
-
96
- Sidekiq stays fast by using the [JProfiler java profiler](http://www.ej-technologies.com/products/jprofiler/overview.html) to find and fix
97
- performance problems on JRuby. Unfortunately MRI does not have good multithreaded profiling tools.
81
+ See the [Sidekiq support page](https://sidekiq.org/support.html) for details.
98
82
 
99
83
 
100
84
  License
@@ -106,4 +90,4 @@ Please see [LICENSE](https://github.com/mperham/sidekiq/blob/master/LICENSE) for
106
90
  Author
107
91
  -----------------
108
92
 
109
- Mike Perham, [@mperham](https://twitter.com/mperham) / [@sidekiq](https://twitter.com/sidekiq), [http://www.mikeperham.com](http://www.mikeperham.com) / [http://www.contribsys.com](http://www.contribsys.com)
93
+ Mike Perham, [@getajobmike](https://twitter.com/getajobmike) / [@sidekiq](https://twitter.com/sidekiq), [https://www.mikeperham.com](https://www.mikeperham.com) / [https://www.contribsys.com](https://www.contribsys.com)
data/bin/sidekiq CHANGED
@@ -6,13 +6,37 @@ $TESTING = false
6
6
 
7
7
  require_relative '../lib/sidekiq/cli'
8
8
 
9
+ def integrate_with_systemd
10
+ return unless ENV["NOTIFY_SOCKET"]
11
+
12
+ Sidekiq.configure_server do |config|
13
+ Sidekiq.logger.info "Enabling systemd notification integration"
14
+ require "sidekiq/sd_notify"
15
+ config.on(:startup) do
16
+ Sidekiq::SdNotify.ready
17
+ end
18
+ config.on(:shutdown) do
19
+ Sidekiq::SdNotify.stopping
20
+ end
21
+ Sidekiq.start_watchdog if Sidekiq::SdNotify.watchdog?
22
+ end
23
+ end
24
+
9
25
  begin
10
26
  cli = Sidekiq::CLI.instance
11
27
  cli.parse
28
+
29
+ integrate_with_systemd
30
+
12
31
  cli.run
13
32
  rescue => e
14
33
  raise e if $DEBUG
15
- STDERR.puts e.message
16
- STDERR.puts e.backtrace.join("\n")
34
+ if Sidekiq.error_handlers.length == 0
35
+ STDERR.puts e.message
36
+ STDERR.puts e.backtrace.join("\n")
37
+ else
38
+ cli.handle_exception e
39
+ end
40
+
17
41
  exit 1
18
42
  end
data/bin/sidekiqload CHANGED
@@ -5,7 +5,8 @@
5
5
  $TESTING = false
6
6
 
7
7
  #require 'ruby-prof'
8
- Bundler.require(:default)
8
+ require 'bundler/setup'
9
+ Bundler.require(:default, :load_test)
9
10
 
10
11
  require_relative '../lib/sidekiq/cli'
11
12
  require_relative '../lib/sidekiq/launcher'
@@ -13,8 +14,8 @@ require_relative '../lib/sidekiq/launcher'
13
14
  include Sidekiq::Util
14
15
 
15
16
  Sidekiq.configure_server do |config|
16
- #config.options[:concurrency] = 1
17
- config.redis = { db: 13 }
17
+ config.options[:concurrency] = 10
18
+ config.redis = { db: 13, port: 6380, driver: :hiredis }
18
19
  config.options[:queues] << 'default'
19
20
  config.logger.level = Logger::ERROR
20
21
  config.average_scheduled_poll_interval = 2
@@ -28,7 +29,8 @@ class LoadWorker
28
29
  1
29
30
  end
30
31
 
31
- def perform(idx)
32
+ def perform(idx, ts=nil)
33
+ puts(Time.now.to_f - ts) if ts != nil
32
34
  #raise idx.to_s if idx % 100 == 1
33
35
  end
34
36
  end
@@ -36,14 +38,15 @@ end
36
38
  # brew tap shopify/shopify
37
39
  # brew install toxiproxy
38
40
  # gem install toxiproxy
39
- #require 'toxiproxy'
41
+ # run `toxiproxy-server` in a separate terminal window.
42
+ require 'toxiproxy'
40
43
  # simulate a non-localhost network for realer-world conditions.
41
44
  # adding 1ms of network latency has an ENORMOUS impact on benchmarks
42
- #Toxiproxy.populate([{
43
- #"name": "redis",
44
- #"listen": "127.0.0.1:6380",
45
- #"upstream": "127.0.0.1:6379"
46
- #}])
45
+ Toxiproxy.populate([{
46
+ "name": "redis",
47
+ "listen": "127.0.0.1:6380",
48
+ "upstream": "127.0.0.1:6379"
49
+ }])
47
50
 
48
51
  self_read, self_write = IO.pipe
49
52
  %w(INT TERM TSTP TTIN).each do |sig|
@@ -100,21 +103,26 @@ iter.times do
100
103
  end
101
104
  Sidekiq.logger.error "Created #{count*iter} jobs"
102
105
 
106
+ start = Time.now
107
+
103
108
  Monitoring = Thread.new do
104
109
  watchdog("monitor thread") do
105
110
  while true
106
- sleep 1
107
- qsize, retries = Sidekiq.redis do |conn|
108
- conn.pipelined do
109
- conn.llen "queue:default"
110
- conn.zcard "retry"
111
- end
112
- end.map(&:to_i)
113
- total = qsize + retries
114
- #GC.start
115
- Sidekiq.logger.error("RSS: #{Process.rss} Pending: #{total}")
111
+ sleep 0.2
112
+ qsize = Sidekiq.redis do |conn|
113
+ conn.llen "queue:default"
114
+ end
115
+ total = qsize
116
+ #Sidekiq.logger.error("RSS: #{Process.rss} Pending: #{total}")
116
117
  if total == 0
117
- Sidekiq.logger.error("Done")
118
+ Sidekiq.logger.error("Done, #{iter * count} jobs in #{Time.now - start} sec")
119
+ Sidekiq.logger.error("Now here's the latency for three jobs")
120
+
121
+ LoadWorker.perform_async(1, Time.now.to_f)
122
+ LoadWorker.perform_async(2, Time.now.to_f)
123
+ LoadWorker.perform_async(3, Time.now.to_f)
124
+
125
+ sleep 0.2
118
126
  exit(0)
119
127
  end
120
128
  end
@@ -125,8 +133,8 @@ begin
125
133
  #RubyProf::exclude_threads = [ Monitoring ]
126
134
  #RubyProf.start
127
135
  fire_event(:startup)
128
- #Sidekiq.logger.error "Simulating 1ms of latency between Sidekiq and redis"
129
- #Toxiproxy[:redis].downstream(:latency, latency: 1).apply do
136
+ Sidekiq.logger.error "Simulating 1ms of latency between Sidekiq and redis"
137
+ Toxiproxy[:redis].downstream(:latency, latency: 1).apply do
130
138
  launcher = Sidekiq::Launcher.new(Sidekiq.options)
131
139
  launcher.run
132
140
 
@@ -134,7 +142,7 @@ begin
134
142
  signal = readable_io.first[0].gets.strip
135
143
  handle_signal(launcher, signal)
136
144
  end
137
- #end
145
+ end
138
146
  rescue SystemExit => e
139
147
  #Sidekiq.logger.error("Profiling...")
140
148
  #result = RubyProf.stop