resque-scheduler 2.5.0 → 2.5.1

data/.rubocop.yml

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

data/HISTORY.md

@@ -1,5 +1,8 @@
 # Resque Scheduler History / ChangeLog / Release Notes
 
+## 2.5.1 (2014-02-09)
+* Make signal handling (really) Ruby 2 compatible
+
 ## 2.5.0 (2014-02-09)
 * Use `logger.error` when logging errors from `handle_errors`
 * Added search feature to the Delayed tab in Resque Web

data/lib/resque/scheduler.rb

@@ -12,6 +12,12 @@ module Resque
         yield self
       end
 
+      attr_writer :signal_queue
+
+      def signal_queue
+        @signal_queue ||= []
+      end
+
       # Used in `#load_schedule_job`
       attr_writer :env
 
@@ -110,37 +116,47 @@ module Resque
           load_schedule!
         end
 
-        @th = Thread.current
-
-        # Now start the scheduling part of the loop.
-        loop do
-          if is_master?
-            begin
-              handle_delayed_items
-              update_schedule if dynamic
-            rescue Errno::EAGAIN, Errno::ECONNRESET => e
-              warn e.message
+        begin
+          @th = Thread.current
+
+          # Now start the scheduling part of the loop.
+          loop do
+            if is_master?
+              begin
+                handle_delayed_items
+                update_schedule if dynamic
+              rescue Errno::EAGAIN, Errno::ECONNRESET => e
+                log! e.message
+              end
             end
+            handle_signals
+            poll_sleep
           end
-          poll_sleep
-        end
 
-        # never gets here.
+        rescue Interrupt
+          log 'Exiting'
+        end
       end
 
       # For all signals, set the shutdown flag and wait for current
-      # poll/enqueing to finish (should be almost istant).  In the
+      # poll/enqueing to finish (should be almost instant).  In the
       # case of sleeping, exit immediately.
       def register_signal_handlers
-        trap("TERM") { shutdown }
-        trap("INT") { shutdown }
+        %w(INT TERM USR1 USR2 QUIT).each do |sig|
+          trap(sig) { signal_queue << sig }
+        end
+      end
 
-        begin
-          trap('QUIT') { shutdown }
-          trap('USR1') { print_schedule }
-          trap('USR2') { reload_schedule! }
-        rescue ArgumentError
-          warn "Signals QUIT and USR1 and USR2 not supported."
+      def handle_signals
+        loop do
+          sig = signal_queue.shift
+          break unless sig
+          log! "Got #{sig} signal"
+          case sig
+          when 'INT', 'TERM', 'QUIT' then shutdown
+          when 'USR1' then print_schedule
+          when 'USR2' then reload_schedule!
+          end
         end
       end
 

data/lib/resque_scheduler/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -256,7 +256,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -949662411159458522
+      hash: 322946193888526441
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -265,7 +265,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -949662411159458522
+      hash: 322946193888526441
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23