sidekiq 6.0.4 → 6.0.5

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 CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 6bfe129c0a4abfedbab370011613f8acefe77791327e85993a4048be63507a6d
4
- data.tar.gz: 2a67cee7d61bf27ef76fb54fe077b981de6c9286c3e46dc7303e47a31087fb54
3
+ metadata.gz: 624626b031eb97839cbef07f74a9e94dee930ef51fb1d471b566be9643b76449
4
+ data.tar.gz: 8364d826b034685cbcdb3d46188d88b95add713ec1d3f99998b071aebfe63078
5
5
  SHA512:
6
- metadata.gz: a989ad41c075a9c7accf401d14da3ef28c836668a9e3f49ec09a61f7114b7198c3485ded79c06fa4bb3f3c22271db9a7eaae0f156667d400178d26d6055e7ef0
7
- data.tar.gz: f7200ade5b0f69f2ffbc8c708ed28d0efff3f6b6708ecdbe60ec22903ef2c58a78f362fc8a59540b045d17d91a0e19adbd647dbddd0a166f530087908715337d
6
+ metadata.gz: 7375504648039835a884591e972e87c2e3ce2d0a522e6d40c5c2ead886558866f724a5695276214046c1f08a1ad1e19fc65d07670e098aeb126e76b37621b9a5
7
+ data.tar.gz: c5af7245e5eee8ad3f0a714306e00e781b770f2ca31afeb6418e8fdd65ac9864bd7dc6fa76880449aa1e3f05623ee60a1d7de266ad06c303ca1e4d96b1f1a52b
@@ -32,9 +32,6 @@ jobs:
32
32
  - <<: *save
33
33
  - <<: *unit
34
34
  "ruby-2.6":
35
- environment:
36
- COVERAGE: true
37
- CC_TEST_REPORTER_ID: 003c3033501d70a2653bd887ff9a8b2884a263e6a4e27f2ba68748e15530918d
38
35
  docker:
39
36
  - image: circleci/ruby:2.6
40
37
  - image: circleci/redis:4.0
@@ -43,25 +40,7 @@ jobs:
43
40
  - <<: *restore
44
41
  - <<: *bundle
45
42
  - <<: *save
46
-
47
- - run:
48
- name: Setup Code Climate test-reporter
49
- command: |
50
- # download test reporter as a static binary
51
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
52
- chmod +x ./cc-test-reporter
53
-
54
- - run:
55
- name: Code Climate before-build
56
- command: |
57
- ./cc-test-reporter before-build
58
-
59
43
  - <<: *unit
60
-
61
- - run:
62
- name: Report code coverage to Code Climate
63
- command: |
64
- ./cc-test-reporter after-build -t simplecov --exit-code $?
65
44
  "jruby":
66
45
  docker:
67
46
  - image: circleci/jruby:latest
data/Changes.md CHANGED
@@ -2,6 +2,13 @@
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.0.5
6
+ ---------
7
+
8
+ - Fix broken Web UI response when using NewRelic and Rack 2.1.2+. [#4440]
9
+ - Update APIs to use `UNLINK`, not `DEL`. [#4449]
10
+ - Fix Ruby 2.7 warnings [#4412]
11
+
5
12
  6.0.4
6
13
  ---------
7
14
 
@@ -132,6 +139,12 @@ See the [Logging wiki page](https://github.com/mperham/sidekiq/wiki/Logging) for
132
139
  - Integrate the StandardRB code formatter to ensure consistent code
133
140
  styling. [#4114, gearnode]
134
141
 
142
+ 5.2.8
143
+ ---------
144
+
145
+ - Lock to Rack 2.0.x to prevent future incompatibilities
146
+ - Fix invalid reference in `sidekiqctl`
147
+
135
148
  5.2.7
136
149
  ---------
137
150
 
@@ -1,65 +1,70 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- sidekiq (6.0.4)
4
+ sidekiq (6.0.5)
5
5
  connection_pool (>= 2.2.2)
6
- rack (>= 2.0.0)
6
+ rack (~> 2.0)
7
7
  rack-protection (>= 2.0.0)
8
8
  redis (>= 4.1.0)
9
9
 
10
10
  GEM
11
11
  remote: https://rubygems.org/
12
12
  specs:
13
- actioncable (6.0.2)
14
- actionpack (= 6.0.2)
13
+ actioncable (6.0.2.1)
14
+ actionpack (= 6.0.2.1)
15
15
  nio4r (~> 2.0)
16
16
  websocket-driver (>= 0.6.1)
17
- actionmailbox (6.0.2)
18
- actionpack (= 6.0.2)
19
- activejob (= 6.0.2)
20
- activerecord (= 6.0.2)
21
- activestorage (= 6.0.2)
22
- activesupport (= 6.0.2)
17
+ actionmailbox (6.0.2.1)
18
+ actionpack (= 6.0.2.1)
19
+ activejob (= 6.0.2.1)
20
+ activerecord (= 6.0.2.1)
21
+ activestorage (= 6.0.2.1)
22
+ activesupport (= 6.0.2.1)
23
23
  mail (>= 2.7.1)
24
- actionmailer (6.0.2)
25
- actionpack (= 6.0.2)
26
- actionview (= 6.0.2)
27
- activejob (= 6.0.2)
24
+ actionmailer (6.0.2.1)
25
+ actionpack (= 6.0.2.1)
26
+ actionview (= 6.0.2.1)
27
+ activejob (= 6.0.2.1)
28
28
  mail (~> 2.5, >= 2.5.4)
29
29
  rails-dom-testing (~> 2.0)
30
- actionpack (6.0.2)
31
- actionview (= 6.0.2)
32
- activesupport (= 6.0.2)
33
- rack (~> 2.0)
30
+ actionpack (6.0.2.1)
31
+ actionview (= 6.0.2.1)
32
+ activesupport (= 6.0.2.1)
33
+ rack (~> 2.0, >= 2.0.8)
34
34
  rack-test (>= 0.6.3)
35
35
  rails-dom-testing (~> 2.0)
36
36
  rails-html-sanitizer (~> 1.0, >= 1.2.0)
37
- actiontext (6.0.2)
38
- actionpack (= 6.0.2)
39
- activerecord (= 6.0.2)
40
- activestorage (= 6.0.2)
41
- activesupport (= 6.0.2)
37
+ actiontext (6.0.2.1)
38
+ actionpack (= 6.0.2.1)
39
+ activerecord (= 6.0.2.1)
40
+ activestorage (= 6.0.2.1)
41
+ activesupport (= 6.0.2.1)
42
42
  nokogiri (>= 1.8.5)
43
- actionview (6.0.2)
44
- activesupport (= 6.0.2)
43
+ actionview (6.0.2.1)
44
+ activesupport (= 6.0.2.1)
45
45
  builder (~> 3.1)
46
46
  erubi (~> 1.4)
47
47
  rails-dom-testing (~> 2.0)
48
48
  rails-html-sanitizer (~> 1.1, >= 1.2.0)
49
- activejob (6.0.2)
50
- activesupport (= 6.0.2)
49
+ activejob (6.0.2.1)
50
+ activesupport (= 6.0.2.1)
51
51
  globalid (>= 0.3.6)
52
- activemodel (6.0.2)
53
- activesupport (= 6.0.2)
54
- activerecord (6.0.2)
55
- activemodel (= 6.0.2)
56
- activesupport (= 6.0.2)
57
- activestorage (6.0.2)
58
- actionpack (= 6.0.2)
59
- activejob (= 6.0.2)
60
- activerecord (= 6.0.2)
52
+ activemodel (6.0.2.1)
53
+ activesupport (= 6.0.2.1)
54
+ activerecord (6.0.2.1)
55
+ activemodel (= 6.0.2.1)
56
+ activesupport (= 6.0.2.1)
57
+ activerecord-jdbc-adapter (60.1-java)
58
+ activerecord (~> 6.0.0)
59
+ activerecord-jdbcsqlite3-adapter (60.1-java)
60
+ activerecord-jdbc-adapter (= 60.1)
61
+ jdbc-sqlite3 (~> 3.8, < 3.30)
62
+ activestorage (6.0.2.1)
63
+ actionpack (= 6.0.2.1)
64
+ activejob (= 6.0.2.1)
65
+ activerecord (= 6.0.2.1)
61
66
  marcel (~> 0.3.1)
62
- activesupport (6.0.2)
67
+ activesupport (6.0.2.1)
63
68
  concurrent-ruby (~> 1.0, >= 1.0.2)
64
69
  i18n (>= 0.7, < 2)
65
70
  minitest (~> 5.1)
@@ -67,20 +72,22 @@ GEM
67
72
  zeitwerk (~> 2.2)
68
73
  ast (2.4.0)
69
74
  builder (3.2.4)
70
- byebug (11.0.1)
75
+ byebug (11.1.1)
71
76
  coderay (1.1.2)
72
- concurrent-ruby (1.1.5)
77
+ concurrent-ruby (1.1.6)
73
78
  connection_pool (2.2.2)
74
- crass (1.0.5)
79
+ crass (1.0.6)
75
80
  docile (1.3.2)
76
81
  erubi (1.9.0)
77
82
  globalid (0.4.2)
78
83
  activesupport (>= 4.2.0)
79
84
  hiredis (0.6.3)
80
- i18n (1.7.0)
85
+ hiredis (0.6.3-java)
86
+ i18n (1.8.2)
81
87
  concurrent-ruby (~> 1.0)
82
88
  jaro_winkler (1.5.4)
83
- json (2.2.0)
89
+ jaro_winkler (1.5.4-java)
90
+ jdbc-sqlite3 (3.28.0)
84
91
  loofah (2.4.0)
85
92
  crass (~> 1.0.2)
86
93
  nokogiri (>= 1.5.9)
@@ -89,73 +96,74 @@ GEM
89
96
  marcel (0.3.3)
90
97
  mimemagic (~> 0.3.2)
91
98
  method_source (0.9.2)
92
- mimemagic (0.3.3)
99
+ mimemagic (0.3.4)
93
100
  mini_mime (1.0.2)
94
101
  mini_portile2 (2.4.0)
95
- minitest (5.11.3)
102
+ minitest (5.14.0)
96
103
  nio4r (2.5.2)
97
- nokogiri (1.10.7)
104
+ nio4r (2.5.2-java)
105
+ nokogiri (1.10.8)
98
106
  mini_portile2 (~> 2.4.0)
99
- parallel (1.19.0)
100
- parser (2.6.5.0)
107
+ nokogiri (1.10.8-java)
108
+ parallel (1.19.1)
109
+ parser (2.7.0.2)
101
110
  ast (~> 2.4.0)
102
111
  pry (0.12.2)
103
112
  coderay (~> 1.1.0)
104
113
  method_source (~> 0.9.0)
105
- pry-byebug (3.7.0)
114
+ pry-byebug (3.8.0)
106
115
  byebug (~> 11.0)
107
116
  pry (~> 0.10)
108
- rack (2.0.7)
109
- rack-protection (2.0.7)
117
+ rack (2.2.2)
118
+ rack-protection (2.0.8.1)
110
119
  rack
111
120
  rack-test (1.1.0)
112
121
  rack (>= 1.0, < 3)
113
- rails (6.0.2)
114
- actioncable (= 6.0.2)
115
- actionmailbox (= 6.0.2)
116
- actionmailer (= 6.0.2)
117
- actionpack (= 6.0.2)
118
- actiontext (= 6.0.2)
119
- actionview (= 6.0.2)
120
- activejob (= 6.0.2)
121
- activemodel (= 6.0.2)
122
- activerecord (= 6.0.2)
123
- activestorage (= 6.0.2)
124
- activesupport (= 6.0.2)
122
+ rails (6.0.2.1)
123
+ actioncable (= 6.0.2.1)
124
+ actionmailbox (= 6.0.2.1)
125
+ actionmailer (= 6.0.2.1)
126
+ actionpack (= 6.0.2.1)
127
+ actiontext (= 6.0.2.1)
128
+ actionview (= 6.0.2.1)
129
+ activejob (= 6.0.2.1)
130
+ activemodel (= 6.0.2.1)
131
+ activerecord (= 6.0.2.1)
132
+ activestorage (= 6.0.2.1)
133
+ activesupport (= 6.0.2.1)
125
134
  bundler (>= 1.3.0)
126
- railties (= 6.0.2)
135
+ railties (= 6.0.2.1)
127
136
  sprockets-rails (>= 2.0.0)
128
137
  rails-dom-testing (2.0.3)
129
138
  activesupport (>= 4.2.0)
130
139
  nokogiri (>= 1.6)
131
140
  rails-html-sanitizer (1.3.0)
132
141
  loofah (~> 2.3)
133
- railties (6.0.2)
134
- actionpack (= 6.0.2)
135
- activesupport (= 6.0.2)
142
+ railties (6.0.2.1)
143
+ actionpack (= 6.0.2.1)
144
+ activesupport (= 6.0.2.1)
136
145
  method_source
137
146
  rake (>= 0.8.7)
138
147
  thor (>= 0.20.3, < 2.0)
139
148
  rainbow (3.0.0)
140
- rake (12.3.3)
141
- redis (4.1.2)
142
- redis-namespace (1.6.0)
149
+ rake (13.0.1)
150
+ redis (4.1.3)
151
+ redis-namespace (1.7.0)
143
152
  redis (>= 3.0.4)
144
- rubocop (0.75.1)
153
+ rubocop (0.77.0)
145
154
  jaro_winkler (~> 1.5.1)
146
155
  parallel (~> 1.10)
147
156
  parser (>= 2.6)
148
157
  rainbow (>= 2.2.2, < 4.0)
149
158
  ruby-progressbar (~> 1.7)
150
159
  unicode-display_width (>= 1.4.0, < 1.7)
151
- rubocop-performance (1.5.1)
160
+ rubocop-performance (1.5.2)
152
161
  rubocop (>= 0.71.0)
153
162
  ruby-progressbar (1.10.1)
154
- simplecov (0.17.0)
163
+ simplecov (0.18.2)
155
164
  docile (~> 1.1)
156
- json (>= 1.8, < 3)
157
- simplecov-html (~> 0.10.0)
158
- simplecov-html (0.10.2)
165
+ simplecov-html (~> 0.11)
166
+ simplecov-html (0.12.0)
159
167
  sprockets (4.0.0)
160
168
  concurrent-ruby (~> 1.0)
161
169
  rack (> 1, < 3)
@@ -163,22 +171,26 @@ GEM
163
171
  actionpack (>= 4.0)
164
172
  activesupport (>= 4.0)
165
173
  sprockets (>= 3.0.0)
166
- sqlite3 (1.4.1)
167
- standard (0.1.6)
168
- rubocop (~> 0.75.0)
169
- rubocop-performance (~> 1.5.0)
174
+ sqlite3 (1.4.2)
175
+ standard (0.1.7)
176
+ rubocop (~> 0.77.0)
177
+ rubocop-performance (~> 1.5.1)
170
178
  thor (1.0.1)
171
179
  thread_safe (0.3.6)
180
+ thread_safe (0.3.6-java)
172
181
  toxiproxy (1.0.3)
173
- tzinfo (1.2.5)
182
+ tzinfo (1.2.6)
174
183
  thread_safe (~> 0.1)
175
- unicode-display_width (1.6.0)
184
+ unicode-display_width (1.6.1)
176
185
  websocket-driver (0.7.1)
177
186
  websocket-extensions (>= 0.1.0)
187
+ websocket-driver (0.7.1-java)
188
+ websocket-extensions (>= 0.1.0)
178
189
  websocket-extensions (0.1.4)
179
190
  zeitwerk (2.2.2)
180
191
 
181
192
  PLATFORMS
193
+ java
182
194
  ruby
183
195
 
184
196
  DEPENDENCIES
@@ -194,6 +206,3 @@ DEPENDENCIES
194
206
  sqlite3
195
207
  standard
196
208
  toxiproxy
197
-
198
- BUNDLED WITH
199
- 1.17.2
@@ -273,7 +273,7 @@ module Sidekiq
273
273
  def clear
274
274
  Sidekiq.redis do |conn|
275
275
  conn.multi do
276
- conn.del(@rname)
276
+ conn.unlink(@rname)
277
277
  conn.srem("queues", name)
278
278
  end
279
279
  end
@@ -562,7 +562,7 @@ module Sidekiq
562
562
 
563
563
  def clear
564
564
  Sidekiq.redis do |conn|
565
- conn.del(name)
565
+ conn.unlink(name)
566
566
  end
567
567
  end
568
568
  alias_method :💣, :clear
@@ -182,7 +182,11 @@ module Sidekiq
182
182
  end
183
183
 
184
184
  def set_environment(cli_env)
185
- @environment = cli_env || ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
185
+ # See #984 for discussion.
186
+ # APP_ENV is now the preferred ENV term since it is not tech-specific.
187
+ # Both Sinatra 2.0+ and Sidekiq support this term.
188
+ # RACK_ENV and RAILS_ENV are there for legacy support.
189
+ @environment = cli_env || ENV["APP_ENV"] || ENV["RACK_ENV"] || ENV["RAILS_ENV"] || "development"
186
190
  end
187
191
 
188
192
  def symbolize_keys_deep!(hash)
@@ -381,7 +385,7 @@ module Sidekiq
381
385
  end
382
386
 
383
387
  def rails_app?
384
- defined?(::Rails)
388
+ defined?(::Rails) && ::Rails.respond_to?(:application)
385
389
  end
386
390
  end
387
391
  end
@@ -83,7 +83,7 @@ module Sidekiq
83
83
  Sidekiq.redis do |conn|
84
84
  conn.pipelined do
85
85
  conn.srem("processes", identity)
86
- conn.del("#{identity}:workers")
86
+ conn.unlink("#{identity}:workers")
87
87
  end
88
88
  end
89
89
  rescue
@@ -118,7 +118,7 @@ module Sidekiq
118
118
  conn.incrby("stat:failed:#{nowdate}", fails)
119
119
  conn.expire("stat:failed:#{nowdate}", STATS_TTL)
120
120
 
121
- conn.del(workers_key)
121
+ conn.unlink(workers_key)
122
122
  curstate.each_pair do |tid, hash|
123
123
  conn.hset(workers_key, tid, Sidekiq.dump_json(hash))
124
124
  end
@@ -83,7 +83,7 @@ module Sidekiq
83
83
  # Redefined to check severity against #level, and thus the thread-local level, rather than +@level+.
84
84
  # FIXME: Remove when the minimum Ruby version supports overriding Logger#level.
85
85
  def add(severity, message = nil, progname = nil, &block)
86
- severity ||= UNKNOWN
86
+ severity ||= ::Logger::UNKNOWN
87
87
  progname ||= @progname
88
88
 
89
89
  return true if @logdev.nil? || severity < level
@@ -104,7 +104,7 @@ module Sidekiq
104
104
  class Logger < ::Logger
105
105
  include LoggingUtils
106
106
 
107
- def initialize(*args)
107
+ def initialize(*args, **kwargs)
108
108
  super
109
109
  self.formatter = Sidekiq.log_formatter
110
110
  end
@@ -181,7 +181,7 @@ module Sidekiq
181
181
  # the retry subsystem (e.g. network partition). We won't acknowledge the job
182
182
  # so it can be rescued when using Sidekiq Pro.
183
183
  handle_exception(ex, {context: "Internal exception!", job: job_hash, jobstr: jobstr})
184
- raise e
184
+ raise ex
185
185
  ensure
186
186
  if ack
187
187
  # We don't want a shutdown signal to interrupt job acknowledgment.
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module Sidekiq
4
- VERSION = "6.0.4"
4
+ VERSION = "6.0.5"
5
5
  end
@@ -300,22 +300,20 @@ module Sidekiq
300
300
 
301
301
  resp = case resp
302
302
  when Array
303
+ # redirects go here
303
304
  resp
304
305
  else
306
+ # rendered content goes here
305
307
  headers = {
306
308
  "Content-Type" => "text/html",
307
309
  "Cache-Control" => "no-cache",
308
310
  "Content-Language" => action.locale,
309
311
  "Content-Security-Policy" => CSP_HEADER,
310
312
  }
311
-
313
+ # we'll let Rack calculate Content-Length for us.
312
314
  [200, headers, [resp]]
313
315
  end
314
316
 
315
- resp[1] = resp[1].dup
316
-
317
- resp[1][CONTENT_LENGTH] = resp[2].sum(&:bytesize).to_s
318
-
319
317
  resp
320
318
  end
321
319
 
@@ -295,7 +295,7 @@ module Sidekiq
295
295
  end
296
296
 
297
297
  def environment_title_prefix
298
- environment = Sidekiq.options[:environment] || ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
298
+ environment = Sidekiq.options[:environment] || ENV["APP_ENV"] || ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development"
299
299
 
300
300
  "[#{environment.upcase}] " unless environment == "production"
301
301
  end
@@ -16,6 +16,6 @@ Gem::Specification.new do |gem|
16
16
 
17
17
  gem.add_dependency "redis", ">= 4.1.0"
18
18
  gem.add_dependency "connection_pool", ">= 2.2.2"
19
- gem.add_dependency "rack", ">= 2.0.0"
19
+ gem.add_dependency "rack", "~> 2.0"
20
20
  gem.add_dependency "rack-protection", ">= 2.0.0"
21
21
  end
@@ -79,3 +79,5 @@ ja:
79
79
  CreatedAt: 作成日時
80
80
  BackToApp: アプリに戻る
81
81
  Latency: レイテンシ
82
+ Pause: 一時停止
83
+ Unpause: 一時停止を解除
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sidekiq
3
3
  version: !ruby/object:Gem::Version
4
- version: 6.0.4
4
+ version: 6.0.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Perham
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2019-12-20 00:00:00.000000000 Z
11
+ date: 2020-02-14 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: redis
@@ -42,16 +42,16 @@ dependencies:
42
42
  name: rack
43
43
  requirement: !ruby/object:Gem::Requirement
44
44
  requirements:
45
- - - ">="
45
+ - - "~>"
46
46
  - !ruby/object:Gem::Version
47
- version: 2.0.0
47
+ version: '2.0'
48
48
  type: :runtime
49
49
  prerelease: false
50
50
  version_requirements: !ruby/object:Gem::Requirement
51
51
  requirements:
52
- - - ">="
52
+ - - "~>"
53
53
  - !ruby/object:Gem::Version
54
- version: 2.0.0
54
+ version: '2.0'
55
55
  - !ruby/object:Gem::Dependency
56
56
  name: rack-protection
57
57
  requirement: !ruby/object:Gem::Requirement