resque 1.27.2 → 1.27.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9757198382c0b8e5cf383fc49fe82ce4f59933e
-  data.tar.gz: 6dbda5f17bf9cb44f99c18724b0cb6a6e1422e73
+  metadata.gz: 8cfae1b4e754004c51d8b6d06f5509ca5cdece1e
+  data.tar.gz: d2dd82dcb35a1f14c87aec745e7593e76530d791
 SHA512:
-  metadata.gz: 45cc843a75953f9b5e08ebcded0caafa7da8a833489d6c48922b68d6fecc3192ddd4dbce3f77dffc45cf187a89e6a1e79509a2043e9ce11081996e8466561d75
-  data.tar.gz: 6d5c2fdc451fd17b50b1d82a7f7ed94a25aad40af6cc0515e0cace4304944b0539fee3cc42c64a8608db64135fec5d79db0f9fb6c5f1d13531794923078c4f96
+  metadata.gz: 85e1e6529ca7966731a7b9e9d5fc2539c5ee6819ad721e37920d13f716af9b2f2459c808a46dfe2debe488d93b45f3efd11677e340317a59ba6f4f7b48cd9d6c
+  data.tar.gz: b14850616950503975ba128d33d3b190f5a21eff25236921e19cfdff990b07755ecd1ee9add5b3fc3fab8b905e7d700763102859d0699b0856bf1dd9c70bed19

data/HISTORY.md

@@ -2,6 +2,11 @@
 
 Nothing yet!
 
+## 1.27.3 (2017-04-10)
+
+### Fixed
+* Fix issue where initializing a data store would attempt to hit Redis, even when Resque.inline = true
+
 ## 1.27.2 (2017-02-20)
 
 ### Fixed

data/README.markdown

@@ -450,6 +450,23 @@ If you want to stop processing jobs, but want to leave the worker running
 (for example, to temporarily alleviate load), use `USR2` to stop processing,
 then `CONT` to start it again.
 
+#### Signals on Heroku
+
+When shutting down processes, Heroku sends every process a TERM signal at the
+same time. By default this causes an immediate shutdown of any running job
+leading to frequent `Resque::TermException` errors.  For short running jobs, a simple
+solution is to give a small amount of time for the job to finish
+before killing it.
+
+To accomplish this set the following environment variables:
+
+* `RESQUE_PRE_SHUTDOWN_TIMEOUT` - The time between the parent receiving a shutdown signal (TERM by default) and it sending that signal on to the child process. Designed to give the child process
+time to complete before being forced to die.
+
+* `TERM_CHILD` - Must be set for `RESQUE_PRE_SHUTDOWN_TIMEOUT` to be used. After the timeout, if the child is still running it will raise a `Resque::TermException` and exit.
+
+* `RESQUE_TERM_TIMEOUT` - By default you have a few seconds to handle `Resque::TermException` in your job. `RESQUE_TERM_TIMEOUT` and `RESQUE_PRE_SHUTDOWN_TIMEOUT` must be lower than the [heroku dyno timeout](https://devcenter.heroku.com/articles/limits#exit-timeout).
+
 ### Mysql::Error: MySQL server has gone away
 
 If your workers remain idle for too long they may lose their MySQL connection. Depending on your version of Rails, we recommend the following:
@@ -840,8 +857,7 @@ send patches for any tweaks or improvements you can make to it.
 Questions
 ---------
 
-Please add them to the [FAQ](https://github.com/resque/resque/wiki/FAQ) or
-ask on the Mailing List. The Mailing List is explained further below
+Please add them to the [FAQ](https://github.com/resque/resque/wiki/FAQ) or open an issue on this repo.
 
 
 Development
@@ -873,9 +889,6 @@ it:
 If you get an error requiring any of the dependencies, you may have
 failed to install them or be seeing load path issues.
 
-Feel free to ping the mailing list with your problem and we'll try to
-sort it out.
-
 
 Contributing
 ------------
@@ -894,11 +907,7 @@ Once you've made your great commits:
 Mailing List
 ------------
 
-To join the list simply send an email to <resque@librelist.com>. This
-will subscribe you and send you information about your subscription,
-including unsubscribe information.
-
-The archive can be found at <http://librelist.com/browser/resque/>.
+This mailing list is no longer maintained. The archive can be found at <http://librelist.com/browser/resque/>.
 
 
 Meta

data/lib/resque/data_store.rb

@@ -12,7 +12,6 @@ module Resque
       @failed_queue_access  = FailedQueueAccess.new(@redis)
       @workers              = Workers.new(@redis)
       @stats_access         = StatsAccess.new(@redis)
-      @redis_time_available = redis_time_available?
     end
 
     def_delegators :@queue_access, :push_to_queue,
@@ -92,14 +91,23 @@ module Resque
     end
 
     def server_time
-      time, _ = @redis_time_available ? @redis.time : Time.now
+      time, _ = redis_time_available? ? @redis.time : Time.now
       Time.at(time)
     end
 
+    # only needed until support for Redis 2.4 is removed
     def redis_time_available?
-      @redis.time
-    rescue Redis::CommandError
-      false
+      if @redis_time_available.nil? && !Resque.inline
+        begin
+          @redis_time_available = @redis.time
+        rescue Redis::CommandError
+          @redis_time_available = false
+        end
+      elsif Resque.inline
+        false
+      else
+        @redis_time_available
+      end
     end
     private :redis_time_available?
 

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.27.2'
+  Version = VERSION = '1.27.3'
 end

data/lib/resque/worker.rb

@@ -47,6 +47,10 @@ module Resque
 
     attr_accessor :term_timeout
 
+    attr_accessor :pre_shutdown_timeout
+
+    attr_accessor :term_child_signal
+
     # decide whether to use new_kill_child logic
     attr_accessor :term_child
 
@@ -144,7 +148,8 @@ module Resque
       verbose_value = ENV['LOGGING'] || ENV['VERBOSE']
       self.verbose = verbose_value if verbose_value
       self.very_verbose = ENV['VVERBOSE'] if ENV['VVERBOSE']
-      self.term_timeout = ENV['RESQUE_TERM_TIMEOUT'] || 4.0
+      self.pre_shutdown_timeout = (ENV['RESQUE_PRE_SHUTDOWN_TIMEOUT'] || 0.0).to_f
+      self.term_timeout = (ENV['RESQUE_TERM_TIMEOUT'] || 4.0).to_f
       self.term_child = ENV['TERM_CHILD']
       self.graceful_term = ENV['GRACEFUL_TERM']
       self.run_at_exit_hooks = ENV['RUN_AT_EXIT_HOOKS']
@@ -396,11 +401,13 @@ module Resque
 
     def unregister_signal_handlers
       trap('TERM') do
-        trap ('TERM') do
-          # ignore subsequent terms
+        trap('TERM') do
+          # Ignore subsequent term signals
         end
+
         raise TermException.new("SIGTERM")
       end
+
       trap('INT', 'DEFAULT')
 
       begin
@@ -510,18 +517,26 @@ module Resque
 
     # Kills the forked child immediately with minimal remorse. The job it
     # is processing will not be completed. Send the child a TERM signal,
-    # wait 5 seconds, and then a KILL signal if it has not quit
+    # wait <term_timeout> seconds, and then a KILL signal if it has not quit
+    # If pre_shutdown_timeout has been set to a positive number, it will allow
+    # the child that many seconds before sending the aforementioned TERM and KILL.
     def new_kill_child
       if @child
-        unless Process.waitpid(@child, Process::WNOHANG)
+        unless child_already_exited?
+          if pre_shutdown_timeout && pre_shutdown_timeout > 0.0
+            log_with_severity :debug, "Waiting #{pre_shutdown_timeout.to_f}s for child process to exit"
+            return if wait_for_child_exit(pre_shutdown_timeout)
+          end
+
           log_with_severity :debug, "Sending TERM signal to child #{@child}"
           Process.kill("TERM", @child)
-          (term_timeout.to_f * 10).round.times do |i|
-            sleep(0.1)
-            return if Process.waitpid(@child, Process::WNOHANG)
+
+          if wait_for_child_exit(term_timeout)
+            return
+          else
+            log_with_severity :debug, "Sending KILL signal to child #{@child}"
+            Process.kill("KILL", @child)
           end
-          log_with_severity :debug, "Sending KILL signal to child #{@child}"
-          Process.kill("KILL", @child)
         else
           log_with_severity :debug, "Child #{@child} already quit."
         end
@@ -530,6 +545,18 @@ module Resque
       log_with_severity :error, "Child #{@child} already quit and reaped."
     end
 
+    def child_already_exited?
+      Process.waitpid(@child, Process::WNOHANG)
+    end
+
+    def wait_for_child_exit(timeout)
+      (timeout * 10).round.times do |i|
+        sleep(0.1)
+        return true if child_already_exited?
+      end
+      false
+    end
+
     # are we paused?
     def paused?
       @paused

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque
 version: !ruby/object:Gem::Version
-  version: 1.27.2
+  version: 1.27.3
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Resque is a Redis-backed queueing system.