resque-scheduler 2.5.2 → 2.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ebe5197364fa17dcd71c7ba540ca2112e804c7c
-  data.tar.gz: 976a33de3539e42972fff492ea2dae52fa673ea8
+  metadata.gz: c05f1351c925cc303b776e6350b5930ae402f49e
+  data.tar.gz: 6bf4cb27cb0c669d39eb1b645f0cd6fad6f103fd
 SHA512:
-  metadata.gz: b499e49b8efba273c7449e137b5477d1f02624b84d18d195a5e0d58380394b392d82c62196ced80b020ca002aaf1463c6341b6702f672d4add8fba6ff0112006
-  data.tar.gz: fdab96b1f7a58d5260bce7760a81e3dfaa5f087aebe5f3b57b55b6fb785a784b3f78cb5c431e03d8bdb027b63375eb85d6d435ddd8feffff40a2eea500977fd2
+  metadata.gz: 1cb052b2a716d465e6e3726ca9e287b5b06a8d74f28a2f3bf9507aa6ab896816c0b64f02c013db6350b0c63f3f307434fe012e9837a0b142816bec23f0d517dc
+  data.tar.gz: 7bdd9f1bafceee0773e99c6bc22621d84d37a6bca2894250d33157c0d4a308e03c800c02445a713afd2b1f6a7312d0ec97460496639186ffb48b922219badb8e

data/.rubocop.yml

@@ -18,7 +18,7 @@ CaseEquality:
   Enabled: false
 
 ClassLength:
-  Max: 318
+  Max: 325
 
 ClassVars:
   Enabled: false

data/HISTORY.md

@@ -1,5 +1,8 @@
 # Resque Scheduler History / ChangeLog / Release Notes
 
+## 2.5.3 (2014-02-12)
+* Handling signals during poll sleep
+
 ## 2.5.2 (2014-02-11)
 * Pinning down dependency versions more tightly
 

data/lib/resque/scheduler.rb

@@ -129,7 +129,6 @@ module Resque
                 log! e.message
               end
             end
-            handle_signals
             poll_sleep
           end
 
@@ -385,16 +384,7 @@ module Resque
       def poll_sleep
         handle_shutdown do
           begin
-            begin
-              @sleeping = true
-              sleep poll_sleep_amount
-              @sleeping = false
-            rescue Interrupt
-              if @shutdown
-                Resque.clean_schedules
-                release_master_lock!
-              end
-            end
+            poll_sleep_loop
           ensure
             @sleeping = false
           end
@@ -402,6 +392,24 @@ module Resque
         true
       end
 
+      def poll_sleep_loop
+        @sleeping = true
+        start = Time.now
+        loop do
+          break if (Time.now - start) >= poll_sleep_amount
+          begin
+            sleep 0.01
+            handle_signals
+          rescue Interrupt
+            if @shutdown
+              Resque.clean_schedules
+              release_master_lock!
+            end
+            break
+          end
+        end
+      end
+
       # Sets the shutdown flag, clean schedules and exits if sleeping
       def shutdown
         return if @shutdown

data/lib/resque_scheduler/version.rb

@@ -1,5 +1,5 @@
 # vim:fileencoding=utf-8
 
 module ResqueScheduler
-  VERSION = '2.5.2'
+  VERSION = '2.5.3'
 end

data/test/cli_test.rb

@@ -105,27 +105,10 @@ context 'Cli' do
     cli.pre_run
   end
 
-  test 'initializes dynamic from the env' do
-    cli = new_cli([], { 'DYNAMIC_SCHEDULE' => '1' })
-    assert_equal('flurb', cli.send(:options)[:dynamic])
-  end
-
   test 'defaults to nil dynamic' do
     assert_equal(nil, new_cli.send(:options)[:dynamic])
   end
 
-  test 'accepts dynamic via -D' do
-    cli = new_cli(%w(-D))
-    cli.parse_options
-    assert_equal(true, cli.send(:options)[:dynamic])
-  end
-
-  test 'accepts dynamic via --dynamic-schedule' do
-    cli = new_cli(%w(--dynamic-schedule))
-    cli.parse_options
-    assert_equal(true, cli.send(:options)[:dynamic])
-  end
-
   test 'initializes env from the env' do
     cli = new_cli([], { 'RAILS_ENV' => 'flurb' })
     assert_equal('flurb', cli.send(:options)[:env])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.5.3
 platform: ruby
 authors:
 - Ben VandenBos
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-11 00:00:00.000000000 Z
+date: 2014-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -241,7 +241,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Light weight job scheduling on top of Resque