merge master

Ent-Changes.md

@@ -3,6 +3,13 @@ Sidekiq Enterprise Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+0.7.4
+----------
+
+- Add additional check to prevent duplicate periodic job creation
+- Allow user-specified TTLs for rate limiters [#2607]
+- Paginate rate limiter index page [#2606]
+
 0.7.3
 ----------
 
@@ -11,7 +18,6 @@ Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how t
   rate limit errors.
 - Fix scalability issue with Limiter index page.
 
-
 0.7.2
 ----------
 
@@ -23,7 +29,6 @@ Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how t
 - Fix issue where unique scheduled jobs can't be enqueued upon schedule
   due to the existing unique lock. [#2499]
 
-
 0.7.0
 ----------
 

Pro-Changes.md

@@ -3,6 +3,12 @@ Sidekiq Pro Changelog
 
 Please see [http://sidekiq.org/](http://sidekiq.org/) for more details and how to buy.
 
+2.1.1
+-----------
+
+- Make ShardSet lazier so Redis can first be initialized at startup. [#2603]
+
+
 2.1.0
 -----------
 

lib/sidekiq/cli.rb

@@ -336,7 +336,11 @@ module Sidekiq
         die 1
       end
       @parser.parse!(argv)
-      opts[:config_file] ||= 'config/sidekiq.yml' if File.exist?('config/sidekiq.yml')
+
+      %w[config/sidekiq.yml config/sidekiq.yml.erb].each do |filename|
+        opts[:config_file] ||= filename if File.exist?(filename)
+      end
+
       opts
     end
 

lib/sidekiq/worker.rb

@@ -38,6 +38,18 @@ module Sidekiq
 
     module ClassMethods
 
+      def delay(*args)
+        raise ArgumentError, "Do not call .delay on a Sidekiq::Worker class, call .perform_async"
+      end
+
+      def delay_for(*args)
+        raise ArgumentError, "Do not call .delay_for on a Sidekiq::Worker class, call .perform_in"
+      end
+
+      def delay_until(*args)
+        raise ArgumentError, "Do not call .delay_until on a Sidekiq::Worker class, call .perform_at"
+      end
+
       def perform_async(*args)
         client_push('class' => self, 'args' => args)
       end

test/test_api.rb

@@ -183,7 +183,6 @@ class TestApi < Sidekiq::Test
           assert_equal [1, 'mike'], job.args
           assert_equal Time.new(2012, 12, 26), job.enqueued_at
         end
-
         assert q.latency > 10_000_000
 
         q = Sidekiq::Queue.new('other')
@@ -197,13 +196,19 @@ class TestApi < Sidekiq::Test
       end
 
       it 'unwraps delayed jobs' do
-        ApiWorker.delay.foo(1,2,3)
+        Sidekiq::Queue.delay.foo(1,2,3)
         q = Sidekiq::Queue.new
         x = q.first
-        assert_equal "TestApi::ApiWorker.foo", x.display_class
+        assert_equal "Sidekiq::Queue.foo", x.display_class
         assert_equal [1,2,3], x.display_args
       end
 
+      it 'has no enqueued_at time for jobs enqueued in the future' do
+        job_id = ApiWorker.perform_in(100, 1, 'foo')
+        job = Sidekiq::ScheduledSet.new.find_job(job_id)
+        assert_nil job.enqueued_at
+      end
+
       it 'can delete jobs' do
         q = Sidekiq::Queue.new
         ApiWorker.perform_async(1, 'mike')

web/assets/javascripts/application.js

@@ -58,9 +58,14 @@ function updatePage(url) {
       url: url,
       dataType: 'html'
     }).done(function (data) {
-      var $page = $(data).filter('#page')
+      $data = $(data)
+
+      var $page = $data.filter('#page')
       $('#page').replaceWith($page)
 
+      var $header_status = $data.find('.status')
+      $('.status').replaceWith($header_status)
+
       $("time").timeago()
     })
   }, parseInt(localStorage.timeInterval) || 2000);

web/assets/stylesheets/application.css

@@ -181,6 +181,10 @@ form .btn {
   margin-right: 5px;
 }
 
+form .btn-group .btn {
+  margin-right: 1px;
+}
+
 td form {
   margin-bottom: 0;
 }

web/views/busy.erb

@@ -12,7 +12,6 @@
     </form>
   </div>
 </div>
-</div>
 
 <div class="table_container">
   <table class="processes table table-hover table-bordered table-striped table-white">

web/views/layout.erb

@@ -5,6 +5,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1.0" />
     <link href="<%= root_path %>stylesheets/bootstrap.css" media="screen" rel="stylesheet" type="text/css" />
     <link href="<%= root_path %>stylesheets/application.css" media="screen" rel="stylesheet" type="text/css" />
+    <link rel="shortcut icon" type="image/ico" href="<%= root_path %>images/favicon.ico" />
     <script type="text/javascript" src="<%= root_path %>javascripts/application.js"></script>
     <script type="text/javascript" src="<%= root_path %>javascripts/locales/jquery.timeago.<%= locale %>.js"></script>
     <meta name="google" content="notranslate" />