sidekiq 3.1.2 → 3.1.3

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
  SHA1:
3
- metadata.gz: e7d591f55a898713b2e5b4079a5af73d425e2119
4
- data.tar.gz: dcdd3e867ea0e8005152e3bc89ac5b26e88e4467
3
+ metadata.gz: 4adde5768b38bd2da507698bc57358f36ce64041
4
+ data.tar.gz: 82b200a66bfcc8fcc46532b5b0d055ea87f91370
5
5
  SHA512:
6
- metadata.gz: b83540897c8d927b5ad2a5451762c5ad6cbe08acb92502d6d63bc29c7d17252eafdb83a4fcb224aef35f6619fe738f9f5098ce87637f01e0c165175a23b36559
7
- data.tar.gz: df9c1aa6c78b8098e0bf9d93840843ad8b962306fea97e2e48a96448333f96993142995e7892e535db3a6614b24a5f7b2facb045274c87857ff0d64192b48073
6
+ metadata.gz: 111778ad7a808b0a9b093969846037c03d88440d5dd9e6bcec4cb5196c8831b24a4e6d2bf425e11fbed02b4b61053c15f039d0392d4c9ee67a8278a18edf40c0
7
+ data.tar.gz: 055b58470ee8899a33e0467d6a4d11c202eed48db7c41d740aa469646ad5b075917f2f7bf11e320062d4d3c718065f15a66fbd44d67779e3d925b676259fdaff
@@ -24,6 +24,8 @@ changes a few data elements in Redis. To upgrade cleanly:
24
24
  - `Sidekiq::Worker#retries_exhausted` replaced by `Sidekiq::Worker.sidekiq_retries_exhausted`
25
25
  - `Sidekiq::Workers#each` has changed significantly with a reworking
26
26
  of Sidekiq's internal process/thread data model.
27
+ * `sidekiq/api` is no longer automatically required. If your code uses
28
+ the API, you will need to require it.
27
29
  * Redis-to-Go is no longer transparently activated on Heroku so as to not play
28
30
  favorites with any particular Redis service. You need to set a config option
29
31
  for your app:
data/Changes.md CHANGED
@@ -1,3 +1,10 @@
1
+ 3.1.3
2
+ -----------
3
+
4
+ - Use ENV['DYNO'] on Heroku for hostname display, rather than an ugly UUID. [#1742]
5
+ - Show per-process labels on the Busy page, for feature tagging [#1673]
6
+
7
+
1
8
  3.1.2
2
9
  -----------
3
10
 
@@ -3,6 +3,20 @@ Sidekiq Pro Changelog
3
3
 
4
4
  Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and how to buy.
5
5
 
6
+ 1.7.3
7
+ -----------
8
+
9
+ - Batch callbacks should use the same queue as the associated jobs.
10
+
11
+ 1.7.2
12
+ -----------
13
+
14
+ - **DEPRECATION** Use `Batch#on(:complete)` instead of `Batch#notify`.
15
+ The specific Campfire, HipChat, email and other notification schemes
16
+ will be removed in 2.0.0.
17
+ - Remove batch from UI when successful. [#1745]
18
+ - Convert batch callbacks to be asynchronous jobs for error handling [#1744]
19
+
6
20
  1.7.1
7
21
  -----------
8
22
 
@@ -13,6 +13,7 @@ module Sidekiq
13
13
 
14
14
  DEFAULTS = {
15
15
  :queues => [],
16
+ :labels => [],
16
17
  :concurrency => 25,
17
18
  :require => '.',
18
19
  :environment => nil,
@@ -116,8 +116,10 @@ module Sidekiq
116
116
  end
117
117
 
118
118
  Sidekiq.redis do |conn|
119
- jobs_to_requeue.each do |queue, jobs|
120
- conn.rpush("queue:#{queue}", jobs)
119
+ conn.pipelined do
120
+ jobs_to_requeue.each do |queue, jobs|
121
+ conn.rpush("queue:#{queue}", jobs)
122
+ end
121
123
  end
122
124
  end
123
125
  Sidekiq.logger.info("Pushed #{inprogress.size} messages back to Redis")
@@ -69,6 +69,7 @@ module Sidekiq
69
69
  'tag' => @options[:tag] || '',
70
70
  'concurrency' => @options[:concurrency],
71
71
  'queues' => @options[:queues].uniq,
72
+ 'labels' => Sidekiq.options[:labels],
72
73
  }
73
74
  Sidekiq.redis do |conn|
74
75
  conn.multi do
@@ -27,7 +27,7 @@ module Sidekiq
27
27
  end
28
28
 
29
29
  def hostname
30
- Socket.gethostname
30
+ ENV['DYNO'] || Socket.gethostname
31
31
  end
32
32
 
33
33
  def identity
@@ -1,3 +1,3 @@
1
1
  module Sidekiq
2
- VERSION = "3.1.2"
2
+ VERSION = "3.1.3"
3
3
  end
@@ -282,7 +282,7 @@ class TestWeb < Sidekiq::Test
282
282
  Sidekiq.redis do |conn|
283
283
  pro = 'foo:1234'
284
284
  conn.sadd('processes', pro)
285
- conn.hmset(pro, 'info', Sidekiq.dump_json('started_at' => Time.now.to_f), 'busy', 1, 'beat', Time.now.to_f)
285
+ conn.hmset(pro, 'info', Sidekiq.dump_json('started_at' => Time.now.to_f, 'labels' => ['frumduz']), 'busy', 1, 'beat', Time.now.to_f)
286
286
  identity = "#{pro}:workers"
287
287
  hash = {:queue => 'critical', :payload => { 'class' => "FailWorker", 'args' => ["<a>hello</a>"] }, :run_at => Time.now.to_i }
288
288
  conn.hmset(identity, 100001, Sidekiq.dump_json(hash))
@@ -292,6 +292,7 @@ class TestWeb < Sidekiq::Test
292
292
  get '/busy'
293
293
  assert_equal 200, last_response.status
294
294
  assert_match(/FailWorker/, last_response.body)
295
+ assert_match(/frumduz/, last_response.body)
295
296
  assert last_response.body.include?( "&lt;a&gt;hello&lt;&#x2F;a&gt;" )
296
297
  assert !last_response.body.include?( "<a>hello</a>" )
297
298
 
@@ -23,7 +23,12 @@
23
23
  </thead>
24
24
  <% Sidekiq::ProcessSet.new.each_with_index do |process, index| %>
25
25
  <tr>
26
- <td><%= "#{process['hostname']}:#{process['pid']}" %></td>
26
+ <td>
27
+ <%= "#{process['hostname']}:#{process['pid']}" %>
28
+ <% Array(process['labels']).each do |label| %>
29
+ <span class="label label-info"><%= label %></span>
30
+ <% end %>
31
+ </td>
27
32
  <td><%= relative_time(Time.at(process['started_at'])) %></td>
28
33
  <td><%= process['concurrency'] %></td>
29
34
  <td><%= process['busy'] %></td>
@@ -21,7 +21,7 @@
21
21
  <tr>
22
22
  <td><%= msg.display_class %></td>
23
23
  <td>
24
- <% a = msg.display_args.inspect -%>
24
+ <% a = msg.display_args.inspect %>
25
25
  <% if a.size > 100 %>
26
26
  <%= h(msg.display_args.inspect[0..100]) + "... " %>
27
27
  <button data-toggle="collapse" data-target="#worker_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>
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: 3.1.2
4
+ version: 3.1.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Mike Perham
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-05-26 00:00:00.000000000 Z
11
+ date: 2014-06-01 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: redis