sidekiq 3.3.4 → 3.4.0

data/test/test_scheduled.rb

@@ -55,32 +55,66 @@ class TestScheduled < Sidekiq::Test
     end
 
     it 'should empty the retry and scheduled queues up to the current time' do
+      created_time  = Time.new(2013, 2, 3)
       enqueued_time = Time.new(2013, 2, 4)
 
-      Time.stub(:now, enqueued_time) do
-        @retry.schedule (Time.now - 60).to_f, @error_1
-        @retry.schedule (Time.now - 50).to_f, @error_2
-        @retry.schedule (Time.now + 60).to_f, @error_3
-        @scheduled.schedule (Time.now - 60).to_f, @future_1
-        @scheduled.schedule (Time.now - 50).to_f, @future_2
-        @scheduled.schedule (Time.now + 60).to_f, @future_3
+      Time.stub(:now, created_time) do
+        @retry.schedule (enqueued_time - 60).to_f, @error_1.merge!('created_at' => created_time.to_f)
+        @retry.schedule (enqueued_time - 50).to_f, @error_2.merge!('created_at' => created_time.to_f)
+        @retry.schedule (enqueued_time + 60).to_f, @error_3.merge!('created_at' => created_time.to_f)
+        @scheduled.schedule (enqueued_time - 60).to_f, @future_1.merge!('created_at' => created_time.to_f)
+        @scheduled.schedule (enqueued_time - 50).to_f, @future_2.merge!('created_at' => created_time.to_f)
+        @scheduled.schedule (enqueued_time + 60).to_f, @future_3.merge!('created_at' => created_time.to_f)
+      end
 
+      Time.stub(:now, enqueued_time) do
         @poller.poll
 
         Sidekiq.redis do |conn|
-          assert_equal 1, conn.llen("queue:queue_1")
-          assert_equal enqueued_time.to_f, Sidekiq.load_json(conn.lrange("queue:queue_1", 0, -1)[0])['enqueued_at']
-          assert_equal 1, conn.llen("queue:queue_2")
-          assert_equal enqueued_time.to_f, Sidekiq.load_json(conn.lrange("queue:queue_2", 0, -1)[0])['enqueued_at']
-          assert_equal 1, conn.llen("queue:queue_4")
-          assert_equal enqueued_time.to_f, Sidekiq.load_json(conn.lrange("queue:queue_4", 0, -1)[0])['enqueued_at']
-          assert_equal 1, conn.llen("queue:queue_5")
-          assert_equal enqueued_time.to_f, Sidekiq.load_json(conn.lrange("queue:queue_5", 0, -1)[0])['enqueued_at']
+          %w(queue:queue_1 queue:queue_2 queue:queue_4 queue:queue_5).each do |queue_name|
+            assert_equal 1, conn.llen(queue_name)
+            job = Sidekiq.load_json(conn.lrange(queue_name, 0, -1)[0])
+            assert_equal enqueued_time.to_f, job['enqueued_at']
+            assert_equal created_time.to_f,  job['created_at']
+          end
         end
 
         assert_equal 1, @retry.size
         assert_equal 1, @scheduled.size
       end
     end
+
+    def with_sidekiq_option(name, value)
+      _original, Sidekiq.options[name] = Sidekiq.options[name], value
+      begin
+        yield
+      ensure
+        Sidekiq.options[name] = _original
+      end
+    end
+
+    it 'generates random intervals that target a configured average' do
+      with_sidekiq_option(:poll_interval_average, 10) do
+        i = 500
+        intervals = i.times.map{ @poller.send(:random_poll_interval) }
+
+        assert intervals.all?{|i| i >= 5}
+        assert intervals.all?{|i| i <= 15}
+        assert_in_delta 10, intervals.reduce(&:+).to_f / i, 0.5
+      end
+    end
+
+    it 'calculates an average poll interval based on the number of known Sidekiq processes' do
+      with_sidekiq_option(:average_scheduled_poll_interval, 10) do
+        3.times do |i|
+          Sidekiq.redis do |conn|
+            conn.sadd("processes", "process-#{i}")
+            conn.hset("process-#{i}", "info", nil)
+          end
+        end
+
+        assert_equal 30, @poller.send(:scaled_poll_interval)
+      end
+    end
   end
 end

data/test/test_scheduling.rb

@@ -57,6 +57,15 @@ class TestScheduling < Sidekiq::Test
       assert Sidekiq::Client.push_bulk('class' => ScheduledWorker, 'args' => [['mike'], ['mike']], 'at' => 600)
       @redis.verify
     end
+
+    it 'removes the enqueued_at field when scheduling' do
+      @redis.expect :zadd, true do |key, args|
+        job = Sidekiq.load_json(args.first.last)
+        job.key?('created_at') && !job.key?('enqueued_at')
+      end
+      assert ScheduledWorker.perform_in(1.month, 'mike')
+      @redis.verify
+    end
   end
 
 end

data/test/test_sidekiq.rb

@@ -31,7 +31,7 @@ class TestSidekiq < Sidekiq::Test
 
     it "allows angry developers to express their emotional constitution and remedies it" do
       Sidekiq.❨╯°□°❩╯︵┻━┻
-      assert_equal "Calm down, bro\n", $stdout.string
+      assert_equal "Calm down, yo.\n", $stdout.string
     end
   end
 

data/test/test_web_helpers.rb

@@ -42,5 +42,11 @@ class TestWebHelpers < Sidekiq::Test
 
     obj = Helpers.new('HTTP_ACCEPT_LANGUAGE' => 'zh-CN,zh;q=0.8,en-US;q=0.6,en;q=0.4,ru;q=0.2')
     assert_equal 'zh-cn', obj.locale
+
+    obj = Helpers.new('HTTP_ACCEPT_LANGUAGE' => 'en-us; *')
+    assert_equal 'en', obj.locale
+
+    obj = Helpers.new('HTTP_ACCEPT_LANGUAGE' => '*')
+    assert_equal 'en', obj.locale
   end
 end

data/web/assets/javascripts/application.js

@@ -60,6 +60,8 @@ function updatePage(url) {
     }).done(function (data) {
       var $page = $(data).filter('#page')
       $('#page').replaceWith($page)
+
+      $("time").timeago()
     })
   }, parseInt(localStorage.timeInterval) || 2000);
 }

data/web/assets/stylesheets/application.css

@@ -165,6 +165,10 @@ header.row .pagination {
   width: 100%;
 }
 
+.table_container {
+  overflow: overlay;
+}
+
 table.table-white {
   background-color: #fff;
 }
@@ -738,14 +742,36 @@ div.interval-slider input {
   }
 }
 
-.redis-url
-{
-    max-width: 400px;
-    overflow: hidden;
+.redis-url, .redis-namespace {
+  overflow: scroll;
+  white-space: nowrap;
+}
+
+@media (min-width: 768px) {
+  .redis-url {
+    max-width: 200px;
+  }
+
+  .redis-namespace {
+    max-width: 150px;
+  }
 }
 
-.redis-namespace
-{
-    max-width: 250px;
-    overflow: hidden;
+@media (min-width: 992px) {
+  .redis-url {
+    max-width: 340px;
+  }
+
+  .redis-namespace {
+    max-width: 350px;
+  }
+}
+@media (min-width: 1200px) {
+  .redis-url {
+    max-width: 540px;
+  }
+
+  .redis-namespace {
+    max-width: 350px;
+  }
 }

data/web/views/_job_info.erb

@@ -2,81 +2,83 @@
   <h3><%= t('Job') %></h3>
 </header>
 
-<table class="table table-bordered table-striped">
-  <tbody>
-    <tr>
-      <th><%= t('Queue') %></th>
-      <td>
-        <a href="<%= root_path %>queues/<%= job.queue %>"><%= job.queue %></a>
-      </td>
-    </tr>
-    <tr>
-      <th><%= t('Job') %></th>
-      <td>
-        <code><%= job.display_class %></code>
-      </td>
-    </tr>
-    <tr>
-      <th><%= t('Arguments') %></th>
-      <td>
-        <code class="code-wrap">
-          <!-- We don't want to truncate any job arguments when viewing a single job's status page -->
-          <div class="args-extended"><%= display_args(job.display_args, nil) %></div>
-        </code>
-      </td>
-    </tr>
-    <tr>
-      <th>JID</th>
-      <td>
-        <code><%= job.jid %></code>
-      </td>
-    </tr>
-    <tr>
-      <th><%= t('Enqueued') %></th>
-      <td><%= relative_time(job.enqueued_at) %></td>
-    </tr>
-    <% unless retry_extra_items(job).empty? %>
+<div class="table_container">
+  <table class="table table-bordered table-striped">
+    <tbody>
       <tr>
-        <th><%= t('Extras') %></th>
+        <th><%= t('Queue') %></th>
         <td>
-          <code>
-            <%= retry_extra_items(job).inspect %>
+          <a href="<%= root_path %>queues/<%= job.queue %>"><%= job.queue %></a>
+        </td>
+      </tr>
+      <tr>
+        <th><%= t('Job') %></th>
+        <td>
+          <code><%= job.display_class %></code>
+        </td>
+      </tr>
+      <tr>
+        <th><%= t('Arguments') %></th>
+        <td>
+          <code class="code-wrap">
+            <!-- We don't want to truncate any job arguments when viewing a single job's status page -->
+            <div class="args-extended"><%= display_args(job.display_args, nil) %></div>
           </code>
         </td>
       </tr>
-    <% end %>
-    <% if type == :retry %>
-      <% if job['retry_count'] && job['retry_count'] > 0 %>
+      <tr>
+        <th>JID</th>
+        <td>
+          <code><%= job.jid %></code>
+        </td>
+      </tr>
+      <tr>
+        <th><%= t('Enqueued') %></th>
+        <td><%= relative_time(job.enqueued_at) %></td>
+      </tr>
+      <% unless retry_extra_items(job).empty? %>
         <tr>
-          <th><%= t('RetryCount') %></th>
-          <td><%= job['retry_count'] %></td>
+          <th><%= t('Extras') %></th>
+          <td>
+            <code>
+              <%= retry_extra_items(job).inspect %>
+            </code>
+          </td>
         </tr>
+      <% end %>
+      <% if type == :retry %>
+        <% if job['retry_count'] && job['retry_count'] > 0 %>
+          <tr>
+            <th><%= t('RetryCount') %></th>
+            <td><%= job['retry_count'] %></td>
+          </tr>
+          <tr>
+            <th><%= t('LastRetry') %></th>
+            <td><%= relative_time(Time.at(job['retried_at'])) %></td>
+          </tr>
+        <% else %>
+          <tr>
+            <th><%= t('OriginallyFailed') %></th>
+            <td><%= relative_time(Time.at(job['failed_at'])) %></td>
+          </tr>
+        <% end %>
         <tr>
-          <th><%= t('LastRetry') %></th>
-          <td><%= relative_time(Time.at(job['retried_at'])) %></td>
+          <th><%= t('NextRetry') %></th>
+          <td><%= relative_time(job.at) %></td>
         </tr>
-      <% else %>
+      <% end %>
+      <% if type == :scheduled %>
         <tr>
-          <th><%= t('OriginallyFailed') %></th>
-          <td><%= relative_time(Time.at(job['failed_at'])) %></td>
+          <th><%= t('Scheduled') %></th>
+          <td><%= relative_time(job.at) %></td>
         </tr>
       <% end %>
-      <tr>
-        <th><%= t('NextRetry') %></th>
-        <td><%= relative_time(job.at) %></td>
-      </tr>
-    <% end %>
-    <% if type == :scheduled %>
-      <tr>
-        <th><%= t('Scheduled') %></th>
-        <td><%= relative_time(job.at) %></td>
-      </tr>
-    <% end %>
-    <% if type == :dead %>
-      <tr>
-        <th><%= t('LastRetry') %></th>
-        <td><%= relative_time(job.at) %></td>
-      </tr>
-    <% end %>
-  </tbody>
-</table>
+      <% if type == :dead %>
+        <tr>
+          <th><%= t('LastRetry') %></th>
+          <td><%= relative_time(job.at) %></td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+</div>

data/web/views/_nav.erb

@@ -64,4 +64,3 @@
     </div>
   </div>
 </div>
-</div>

data/web/views/busy.erb

@@ -13,41 +13,43 @@
 </div>
 </div>
 
-<table class="processes table table-hover table-bordered table-striped table-white">
-  <thead>
-    <th><%= t('Name') %></th>
-    <th><%= t('Started') %></th>
-    <th><%= t('Threads') %></th>
-    <th><%= t('Busy') %></th>
-    <th>&nbsp;</th>
-  </thead>
-  <% processes.each do |process| %>
-    <tr>
-      <td width="50%">
-        <%= "#{process['hostname']}:#{process['pid']}" %>
-        <span class="label label-success"><%= process.tag %></span>
-        <% process.labels.each do |label| %>
-          <span class="label label-info"><%= label %></span>
-        <% end %>
-        <br>
-        <b><%= "#{t('Queues')}: " %></b>
-        <%= process['queues'] * ", " %>
-      </td>
-      <td><%= relative_time(Time.at(process['started_at'])) %></td>
-      <td><%= process['concurrency'] %></td>
-      <td><%= process['busy'] %></td>
-      <td>
-        <div class="btn-group pull-right">
-          <form method="POST">
-            <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
-            <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
-            <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
-          </form>
-        </div>
-      </td>
-    </tr>
-  <% end %>
-</table>
+<div class="table_container">
+  <table class="processes table table-hover table-bordered table-striped table-white">
+    <thead>
+      <th><%= t('Name') %></th>
+      <th><%= t('Started') %></th>
+      <th><%= t('Threads') %></th>
+      <th><%= t('Busy') %></th>
+      <th>&nbsp;</th>
+    </thead>
+    <% processes.each do |process| %>
+      <tr>
+        <td width="50%">
+          <%= "#{process['hostname']}:#{process['pid']}" %>
+          <span class="label label-success"><%= process.tag %></span>
+          <% process.labels.each do |label| %>
+            <span class="label label-info"><%= label %></span>
+          <% end %>
+          <br>
+          <b><%= "#{t('Queues')}: " %></b>
+          <%= process['queues'] * ", " %>
+        </td>
+        <td><%= relative_time(Time.at(process['started_at'])) %></td>
+        <td><%= process['concurrency'] %></td>
+        <td><%= process['busy'] %></td>
+        <td>
+          <div class="btn-group pull-right">
+            <form method="POST">
+              <input type="hidden" name="identity" value="<%= process['identity'] %>"/>
+              <button class="btn btn-warn" type="submit" name="quiet" value="1"><%= t('Quiet') %></button>
+              <button class="btn btn-danger" type="submit" name="stop" value="1"><%= t('Stop') %></button>
+            </form>
+          </div>
+        </td>
+      </tr>
+    <% end %>
+  </table>
+</div>
 
 <div class="row header">
   <div class="col-sm-7">
@@ -55,30 +57,32 @@
   </div>
 </div>
 
-<table class="workers table table-hover table-bordered table-striped table-white">
-  <thead>
-    <th><%= t('Process') %></th>
-    <th><%= t('TID') %></th>
-    <th><%= t('JID') %></th>
-    <th><%= t('Queue') %></th>
-    <th><%= t('Job') %></th>
-    <th><%= t('Arguments') %></th>
-    <th><%= t('Started') %></th>
-  </thead>
-  <% workers.each do |process, thread, msg| %>
-    <% job = Sidekiq::Job.new(msg['payload']) %>
-    <tr>
-      <td><%= process %></td>
-      <td><%= thread %></td>
-      <td><%= job.jid %></td>
-      <td>
-        <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
-      </td>
-      <td><%= job.display_class %></td>
-      <td>
-        <div class="args"><%= display_args(job.display_args) %></div>
-      </td>
-      <td><%= relative_time(Time.at(msg['run_at'])) %></td>
-    </tr>
-  <% end %>
-</table>
+<div class="table_container">
+  <table class="workers table table-hover table-bordered table-striped table-white">
+    <thead>
+      <th><%= t('Process') %></th>
+      <th><%= t('TID') %></th>
+      <th><%= t('JID') %></th>
+      <th><%= t('Queue') %></th>
+      <th><%= t('Job') %></th>
+      <th><%= t('Arguments') %></th>
+      <th><%= t('Started') %></th>
+    </thead>
+    <% workers.each do |process, thread, msg| %>
+      <% job = Sidekiq::Job.new(msg['payload']) %>
+      <tr>
+        <td><%= process %></td>
+        <td><%= thread %></td>
+        <td><%= job.jid %></td>
+        <td>
+          <a href="<%= root_path %>queues/<%= msg['queue'] %>"><%= msg['queue'] %></a>
+        </td>
+        <td><%= job.display_class %></td>
+        <td>
+          <div class="args"><%= display_args(job.display_args) %></div>
+        </td>
+        <td><%= relative_time(Time.at(msg['run_at'])) %></td>
+      </tr>
+    <% end %>
+  </table>
+</div>