sidekiq 3.1.2 → 3.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7d591f55a898713b2e5b4079a5af73d425e2119
-  data.tar.gz: dcdd3e867ea0e8005152e3bc89ac5b26e88e4467
+  metadata.gz: 4adde5768b38bd2da507698bc57358f36ce64041
+  data.tar.gz: 82b200a66bfcc8fcc46532b5b0d055ea87f91370
 SHA512:
-  metadata.gz: b83540897c8d927b5ad2a5451762c5ad6cbe08acb92502d6d63bc29c7d17252eafdb83a4fcb224aef35f6619fe738f9f5098ce87637f01e0c165175a23b36559
-  data.tar.gz: df9c1aa6c78b8098e0bf9d93840843ad8b962306fea97e2e48a96448333f96993142995e7892e535db3a6614b24a5f7b2facb045274c87857ff0d64192b48073
+  metadata.gz: 111778ad7a808b0a9b093969846037c03d88440d5dd9e6bcec4cb5196c8831b24a4e6d2bf425e11fbed02b4b61053c15f039d0392d4c9ee67a8278a18edf40c0
+  data.tar.gz: 055b58470ee8899a33e0467d6a4d11c202eed48db7c41d740aa469646ad5b075917f2f7bf11e320062d4d3c718065f15a66fbd44d67779e3d925b676259fdaff

data/3.0-Upgrade.md

@@ -24,6 +24,8 @@ changes a few data elements in Redis.  To upgrade cleanly:
   - `Sidekiq::Worker#retries_exhausted` replaced by `Sidekiq::Worker.sidekiq_retries_exhausted`
   - `Sidekiq::Workers#each` has changed significantly with a reworking
     of Sidekiq's internal process/thread data model.
+* `sidekiq/api` is no longer automatically required.  If your code uses
+  the API, you will need to require it.
 * Redis-to-Go is no longer transparently activated on Heroku so as to not play
   favorites with any particular Redis service. You need to set a config option
   for your app:

data/Changes.md

@@ -1,3 +1,10 @@
+3.1.3
+-----------
+
+- Use ENV['DYNO'] on Heroku for hostname display, rather than an ugly UUID. [#1742]
+- Show per-process labels on the Busy page, for feature tagging [#1673]
+
+
 3.1.2
 -----------
 

data/Pro-Changes.md

@@ -3,6 +3,20 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/pro](http://sidekiq.org/pro) for more details and how to buy.
 
+1.7.3
+-----------
+
+- Batch callbacks should use the same queue as the associated jobs.
+
+1.7.2
+-----------
+
+- **DEPRECATION** Use `Batch#on(:complete)` instead of `Batch#notify`.
+  The specific Campfire, HipChat, email and other notification schemes
+  will be removed in 2.0.0.
+- Remove batch from UI when successful. [#1745]
+- Convert batch callbacks to be asynchronous jobs for error handling [#1744]
+
 1.7.1
 -----------
 

data/lib/sidekiq.rb

@@ -13,6 +13,7 @@ module Sidekiq
 
   DEFAULTS = {
     :queues => [],
+    :labels => [],
     :concurrency => 25,
     :require => '.',
     :environment => nil,

data/lib/sidekiq/fetch.rb

@@ -116,8 +116,10 @@ module Sidekiq
       end
 
       Sidekiq.redis do |conn|
-        jobs_to_requeue.each do |queue, jobs|
-          conn.rpush("queue:#{queue}", jobs)
+        conn.pipelined do
+          jobs_to_requeue.each do |queue, jobs|
+            conn.rpush("queue:#{queue}", jobs)
+          end
         end
       end
       Sidekiq.logger.info("Pushed #{inprogress.size} messages back to Redis")

data/lib/sidekiq/launcher.rb

@@ -69,6 +69,7 @@ module Sidekiq
         'tag' => @options[:tag] || '',
         'concurrency' => @options[:concurrency],
         'queues' => @options[:queues].uniq,
+        'labels' => Sidekiq.options[:labels],
       }
       Sidekiq.redis do |conn|
         conn.multi do

data/lib/sidekiq/util.rb

@@ -27,7 +27,7 @@ module Sidekiq
     end
 
     def hostname
-      Socket.gethostname
+      ENV['DYNO'] || Socket.gethostname
     end
 
     def identity

data/lib/sidekiq/version.rb

@@ -1,3 +1,3 @@
 module Sidekiq
-  VERSION = "3.1.2"
+  VERSION = "3.1.3"
 end

data/test/test_web.rb

@@ -282,7 +282,7 @@ class TestWeb < Sidekiq::Test
       Sidekiq.redis do |conn|
         pro = 'foo:1234'
         conn.sadd('processes', pro)
-        conn.hmset(pro, 'info', Sidekiq.dump_json('started_at' => Time.now.to_f), 'busy', 1, 'beat', Time.now.to_f)
+        conn.hmset(pro, 'info', Sidekiq.dump_json('started_at' => Time.now.to_f, 'labels' => ['frumduz']), 'busy', 1, 'beat', Time.now.to_f)
         identity = "#{pro}:workers"
         hash = {:queue => 'critical', :payload => { 'class' => "FailWorker", 'args' => ["<a>hello</a>"] }, :run_at => Time.now.to_i }
         conn.hmset(identity, 100001, Sidekiq.dump_json(hash))
@@ -292,6 +292,7 @@ class TestWeb < Sidekiq::Test
       get '/busy'
       assert_equal 200, last_response.status
       assert_match(/FailWorker/, last_response.body)
+      assert_match(/frumduz/, last_response.body)
       assert last_response.body.include?( "&lt;a&gt;hello&lt;&#x2F;a&gt;" )
       assert !last_response.body.include?( "<a>hello</a>" )
 

data/web/views/busy.erb

@@ -23,7 +23,12 @@
   </thead>
   <% Sidekiq::ProcessSet.new.each_with_index do |process, index| %>
     <tr>
-      <td><%= "#{process['hostname']}:#{process['pid']}" %></td>
+      <td>
+        <%= "#{process['hostname']}:#{process['pid']}" %>
+        <% Array(process['labels']).each do |label| %>
+          <span class="label label-info"><%= label %></span>
+        <% end %>
+      </td>
       <td><%= relative_time(Time.at(process['started_at'])) %></td>
       <td><%= process['concurrency'] %></td>
       <td><%= process['busy'] %></td>

data/web/views/queue.erb

@@ -21,7 +21,7 @@
     <tr>
       <td><%= msg.display_class %></td>
       <td>
-        <% a = msg.display_args.inspect -%>
+        <% a = msg.display_args.inspect %>
         <% if a.size > 100 %>
           <%= h(msg.display_args.inspect[0..100]) + "... " %>
           <button data-toggle="collapse" data-target="#worker_<%= index %>" class="btn btn-default btn-xs"><%= t('ShowAll') %></button>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-26 00:00:00.000000000 Z
+date: 2014-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis