resque 1.27.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: acae072e3d9a8528a3dc20919ea2c0bd06c90d45
-  data.tar.gz: 3de81881552589630db942941bb3ff6b8353ff24
+SHA256:
+  metadata.gz: 845d352e5d2e155c7a3c0c94b825abe83cc0daa617e70ac85fb6f2ec0fbad452
+  data.tar.gz: 887666edf6aaa2b4bbc372001ece5b1fb354801be30786160ee0cde6b16828c0
 SHA512:
-  metadata.gz: 20fa32261ff9fd4744a7c2bb32265fa545d2cc4dda3433f1513291e6cec91d3503cfc4120b990b2ed96507c7848dfbfe474682e10b0ed68a7188798b88819e08
-  data.tar.gz: b623868af21a1ccb630ef02f0f9ed1892845041f01926564a01559a6bdac783c6353822705b7c82f1d750c167a743972b7d54d859c0fed66a57826c3ea498cf8
+  metadata.gz: e99e247f115ce75ad125e7f4aa0bf1587e67426c424e3767ab856c4a03c9868ebb922a958aaff689f316beb9b2b07ca0d1818b592a300d6a2358af3b1312932a
+  data.tar.gz: '081fe527bb158cee4c9e8c31d552904b20e1fa39984466a2f7d1851facdbb2f0eb1f3ec865ae6d9cafee79278a392316822d0cdc4aff7a5c3076f96f8907d26a'

data/HISTORY.md

@@ -1,8 +1,25 @@
-## Unreleased
+## 2.0.0 (2018-11-06)
 
-Nothing yet!
+### Fixed
+* Fix Airbrake failure backend
+* Fix failed jobs page "argument out of range" error
+
+### Changed
+* Remove support for Rubies < 2.3
+* Remove support to Rails < 4
+* Reduce the number of redis calls when trying to get the list of queues
+* Only run `eager_load!` if `Rails.application.config.eager_load` is true
+* Don't display log message if running without hooks
+* Add Support to Redis 4.0
+* Drop complex Redis identifier logic in favor of simple inspect
+* When a child process is killed, report the signal it was terminated with
+* Report a job that pruned worker was processing
+
+### Added
+
+* Allow to configure statistic data store
 
-## 1.27.4 (2017-4-15)
+## 1.27.4 (2017-04-15)
 
 ### Fixed
 * Fix issue where removing a failure from Resque web didn't work when using `RedisMultiQueue` backend.

data/README.markdown

@@ -3,7 +3,6 @@ Resque
 
 [![Gem Version](https://badge.fury.io/rb/resque.svg)](https://rubygems.org/gems/resque)
 [![Build Status](https://travis-ci.org/resque/resque.svg)](https://travis-ci.org/resque/resque)
-[![Coverage Status](https://coveralls.io/repos/github/resque/resque/badge.svg?branch=1-x-stable)](https://coveralls.io/r/resque/resque?branch=1-x-stable)
 
 Resque (pronounced like "rescue") is a Redis-backed library for creating
 background jobs, placing those jobs on multiple queues, and processing
@@ -34,6 +33,9 @@ The Resque frontend tells you what workers are doing, what workers are
 not doing, what queues you're using, what's in those queues, provides
 general usage stats, and helps you track failures.
 
+Resque now supports Ruby 2.3.0 and above.
+We will also only be supporting Redis 3.0 and above going forward.
+
 
 The Blog Post
 -------------
@@ -196,7 +198,7 @@ We plan to provide first class `async` support in a future release.
 If a job raises an exception, it is logged and handed off to the
 `Resque::Failure` module. Failures are logged either locally in Redis
 or using some different backend. To see exceptions while developing,
-use VERBOSE env variable, see details below under Logging.
+see details below under Logging.
 
 For example, Resque ships with Airbrake support. To configure it, put
 the following into an initialisation file or into your rake job:
@@ -267,12 +269,14 @@ but in the Resque workers it's fine.
 
 ### Logging
 
-Workers support basic logging to STDOUT. If you start them with the
-`VERBOSE` env variable set, they will print basic debugging
-information. You can also set the `VVERBOSE` (very verbose) env
-variable.
+Workers support basic logging to STDOUT.
+
+You can control the logging threshold using `Resque.logger.level`:
 
-    $ VVERBOSE=1 QUEUE=file_serve rake environment resque:work
+```ruby
+# config/initializers/resque.rb
+Resque.logger.level = Logger::DEBUG
+```
 
 If you want Resque to log to a file, in Rails do:
 
@@ -281,6 +285,33 @@ If you want Resque to log to a file, in Rails do:
 Resque.logger = Logger.new(Rails.root.join('log', "#{Rails.env}_resque.log"))
 ```
 
+### Storing Statistics
+ Resque allows to store count of processed and failed jobs.
+
+ By default it will store it in Redis using the keys `stats:processed` and `stats:failed`.
+
+ Some apps would want another stats store, or even a null store:
+
+ ```ruby
+# config/initializers/resque.rb
+class NullDataStore
+  def stat(stat)
+    0
+  end
+
+  def increment_stat(stat, by)
+  end
+
+  def decrement_stat(stat, by)
+  end
+
+  def clear_stat(stat)
+  end
+end
+
+Resque.stat_data_store = NullDataStore.new
+```
+
 ### Process IDs (PIDs)
 
 There are scenarios where it's helpful to record the PID of a resque
@@ -290,7 +321,7 @@ worker process.  Use the PIDFILE option for easy access to the PID:
 
 ### Running in the background
 
-(Only supported with ruby >= 1.9). There are scenarios where it's helpful for
+There are scenarios where it's helpful for
 the resque worker to run itself in the background (usually in combination with
 PIDFILE).  Use the BACKGROUND option so that rake will return as soon as the
 worker is started.
@@ -458,6 +489,11 @@ leading to frequent `Resque::TermException` errors.  For short running jobs, a s
 solution is to give a small amount of time for the job to finish
 before killing it.
 
+Resque doesn't handle this out of the box (for both cedar-14 and heroku-16), you need to
+install the [`resque-heroku-signals`](https://github.com/iloveitaly/resque-heroku-signals)
+addon which adds the required signal handling to make the behavior described above work.
+Related issue: https://github.com/resque/resque/issues/1559
+
 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
@@ -651,7 +687,7 @@ require 'your/app'
 require 'resque/tasks'
 ```
 
-If you're using Rails 5.x, include the following in lib/tasks/resque.rb:
+If you're using Rails 5.x, include the following in lib/tasks/resque.rake:
 
 ```ruby
 require 'resque/tasks'
@@ -770,15 +806,16 @@ Here's our `config/resque.yml`:
     test: localhost:6379
     staging: redis1.se.github.com:6379
     fi: localhost:6379
-    production: redis1.ae.github.com:6379
+    production: <%= ENV['REDIS_URL'] %>
 
 And our initializer:
 
 ``` ruby
 rails_root = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..'
 rails_env = ENV['RAILS_ENV'] || 'development'
+config_file = rails_root + '/config/resque.yml'
 
-resque_config = YAML.load_file(rails_root + '/config/resque.yml')
+resque_config = YAML::load(ERB.new(IO.read(config_file)).result)
 Resque.redis = resque_config[rails_env]
 ```
 

data/lib/resque.rb

@@ -112,8 +112,8 @@ module Resque
   def redis=(server)
     case server
     when String
-      if server =~ /redis\:\/\//
-        redis = Redis.connect(:url => server, :thread_safe => true)
+      if server =~ /rediss?\:\/\//
+        redis = Redis.new(:url => server, :thread_safe => true)
       else
         server, namespace = server.split('/', 2)
         host, port, db = server.split(':')
@@ -147,26 +147,76 @@ module Resque
     data_store.identifier
   end
 
+  # Set the data store for the processed and failed statistics.
+  #
+  # By default it uses the same as `Resque.redis`, but different stores can be used.
+  #
+  # A custom store needs to obey the following API to work correctly
+  #
+  # class NullDataStore
+  #   # Returns the current value for the given stat.
+  #   def stat(stat)
+  #   end
+  #
+  #   # Increments the stat by the given value.
+  #   def increment_stat(stat, by)
+  #   end
+  #
+  #   # Decrements the stat by the given value.
+  #   def decrement_stat(stat, by)
+  #   end
+  #
+  #   # Clear the values for the given stat.
+  #   def clear_stat(stat)
+  #   end
+  # end
+  def stat_data_store=(stat_data_store)
+    Resque::Stat.data_store = stat_data_store
+  end
+
+  # Returns the data store for the statistics module.
+  def stat_data_store
+    Resque::Stat.data_store
+  end
+
   # Set or retrieve the current logger object
   attr_accessor :logger
 
   DEFAULT_HEARTBEAT_INTERVAL = 60
   DEFAULT_PRUNE_INTERVAL = DEFAULT_HEARTBEAT_INTERVAL * 5
 
+  # Defines how often a Resque worker updates the heartbeat key. Must be less
+  # than the prune interval.
   attr_writer :heartbeat_interval
   def heartbeat_interval
-    @heartbeat_interval || DEFAULT_HEARTBEAT_INTERVAL
+    if defined? @heartbeat_interval
+      @heartbeat_interval
+    else
+      DEFAULT_HEARTBEAT_INTERVAL
+    end
   end
 
+  # Defines how often Resque checks for dead workers.
   attr_writer :prune_interval
   def prune_interval
-    @prune_interval || DEFAULT_PRUNE_INTERVAL
+    if defined? @prune_interval
+      @prune_interval
+    else
+      DEFAULT_PRUNE_INTERVAL
+    end
   end
 
+  # By default, jobs are pushed to the back of the queue and popped from
+  # the front, resulting in "first in, first out" (FIFO) execution order.
+  # Set to true to push jobs to the front of the queue instead, resulting
+  # in "last in, first out" (LIFO) execution order.
   attr_writer :enqueue_front
   def enqueue_front
-    return @enqueue_front unless @enqueue_front.nil?
-    @enqueue_front = false
+    if defined? @enqueue_front
+      @enqueue_front
+    else
+      @enqueue_front = false
+    end
   end
 
   # The `before_first_fork` hook will be run in the **parent** process
@@ -424,7 +474,7 @@ module Resque
   # Given a class, try to extrapolate an appropriate queue based on a
   # class instance variable or `queue` method.
   def queue_from_class(klass)
-    klass.instance_variable_get(:@queue) ||
+    (klass.instance_variable_defined?(:@queue) && klass.instance_variable_get(:@queue)) ||
       (klass.respond_to?(:queue) and klass.queue)
   end
 
@@ -483,7 +533,7 @@ module Resque
   # Returns a hash, similar to redis-rb's #info, of interesting stats.
   def info
     return {
-      :pending   => queue_sizes.inject(0) { |sum, (queue_name, queue_size)| sum + queue_size },
+      :pending   => queue_sizes.inject(0) { |sum, (_queue_name, queue_size)| sum + queue_size },
       :processed => Stat[:processed],
       :queues    => queues.size,
       :workers   => workers.size.to_i,
@@ -543,6 +593,8 @@ module Resque
 
   private
 
+  @hooks = Hash.new { |h, k| h[k] = [] }
+
   # Register a new proc as a hook. If the block is nil this is the
   # equivalent of removing all hooks of the given name.
   #
@@ -550,26 +602,18 @@ module Resque
   def register_hook(name, block)
     return clear_hooks(name) if block.nil?
 
-    @hooks ||= {}
-    @hooks[name] ||= []
-
     block = Array(block)
     @hooks[name].concat(block)
   end
 
   # Clear all hooks given a hook name.
   def clear_hooks(name)
-    @hooks && @hooks[name] = []
-  end
-
-  # Retrieve all hooks
-  def hooks
-    @hooks || {}
+    @hooks[name] = []
   end
 
   # Retrieve all hooks of a given name.
   def hooks(name)
-    (@hooks && @hooks[name]) || []
+    @hooks[name]
   end
 end
 

data/lib/resque/data_store.rb

@@ -44,14 +44,20 @@ module Resque
                               :heartbeat!,
                               :remove_heartbeat,
                               :all_heartbeats,
+                              :acquire_pruning_dead_worker_lock,
                               :set_worker_payload,
                               :worker_start_time,
                               :worker_done_working
 
-      def_delegators :@stats_access, :clear_stat,
-                                     :decremet_stat,
-                                     :increment_stat,
-                                     :stat
+    def_delegators :@stats_access, :clear_stat,
+                                   :decrement_stat,
+                                   :increment_stat,
+                                   :stat
+
+    def decremet_stat(*args)
+      warn '[Resque] [Deprecation] Resque::DataStore #decremet_stat method is deprecated (please use #decrement_stat)'
+      decrement_stat(*args)
+    end
 
     # Compatibility with any non-Resque classes that were using Resque.redis as a way to access Redis
     def method_missing(sym,*args,&block)
@@ -67,19 +73,12 @@ module Resque
     # Get a string identifying the underlying server.
     # Probably should be private, but was public so must stay public
     def identifier
-      # support 1.x versions of redis-rb
-      if @redis.respond_to?(:server)
-        @redis.server
-      elsif @redis.respond_to?(:nodes) # distributed
-        @redis.nodes.map { |n| n.id }.join(', ')
-      else
-        @redis.client.id
-      end
+      @redis.inspect
     end
 
     # Force a reconnect to Redis.
     def reconnect
-      @redis.client.reconnect
+      @redis._client.reconnect
     end
 
     # Returns an array of all known Resque keys in Redis. Redis' KEYS operation
@@ -91,26 +90,10 @@ module Resque
     end
 
     def server_time
-      time, _ = redis_time_available? ? @redis.time : Time.now
+      time, _ = @redis.time
       Time.at(time)
     end
 
-    # only needed until support for Redis 2.4 is removed
-    def redis_time_available?
-      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?
-
     class QueueAccess
       def initialize(redis)
         @redis = redis
@@ -291,6 +274,10 @@ module Resque
         @redis.hgetall(HEARTBEAT_KEY)
       end
 
+      def acquire_pruning_dead_worker_lock(worker, expiry)
+        @redis.set(redis_key_for_worker_pruning, worker.to_s, :ex => expiry, :nx => true)
+      end
+
       def set_worker_payload(worker, data)
         @redis.set(redis_key_for_worker(worker), data)
       end
@@ -315,6 +302,10 @@ module Resque
       def redis_key_for_worker_start_time(worker)
         "#{redis_key_for_worker(worker)}:started"
       end
+
+      def redis_key_for_worker_pruning
+        "pruning_dead_workers_in_progress"
+      end
     end
 
     class StatsAccess

data/lib/resque/errors.rb

@@ -14,7 +14,13 @@ module Resque
       super message
     end
   end
-  class PruneDeadWorkerDirtyExit < DirtyExit; end
+
+  class PruneDeadWorkerDirtyExit < DirtyExit
+    def initialize(hostname, job)
+      job ||= "<Unknown Job>"
+      super("Worker #{hostname} did not gracefully exit while processing #{job}")
+    end
+  end
 
   # Raised when child process is TERM'd so job can rescue this to do shutdown work.
   class TermException < SignalException; end

data/lib/resque/failure.rb

@@ -27,6 +27,7 @@ module Resque
     def self.backend=(backend)
       @backend = backend
     end
+    self.backend = nil
 
     # Returns the current backend class. If none has been set, falls
     # back to `Resque::Failure::Redis`

data/lib/resque/failure/airbrake.rb

@@ -9,7 +9,7 @@ module Resque
     class Airbrake < Base
       def self.configure(&block)
         Resque.logger.warn "This actually sets global Airbrake configuration, " \
-          "which is probably not what you want. This will be gone in 2.0."
+          "which is probably not what you want."
         Resque::Failure.backend = self
         ::Airbrake.configure(&block)
       end
@@ -21,12 +21,24 @@ module Resque
       end
 
       def save
-        ::Airbrake.notify(exception,
-            :parameters => {
-            :payload_class => payload['class'].to_s,
-            :payload_args => payload['args'].inspect
-            }
-          )
+        notify(
+          exception,
+          parameters: {
+            payload_class: payload['class'].to_s,
+            payload_args: payload['args'].inspect
+          }
+        )
+      end
+
+      private
+
+      def notify(exception, options)
+        if ::Airbrake.respond_to?(:notify_sync)
+          ::Airbrake.notify_sync(exception, options)
+        else
+          # Older versions of Airbrake (< 5)
+          ::Airbrake.notify(exception, options)
+        end
       end
     end
   end

data/lib/resque/failure/redis_multi_queue.rb

@@ -60,7 +60,7 @@ module Resque
         end
         items.each_with_index do |item, i|
           if !class_name || (item['payload'] && item['payload']['class'] == class_name)
-            id = reversed ? (items.length - 1) - (offset + i) : offset + i
+            id = reversed ? (items.length - 1) + (offset - i) : offset + i
             yield id, item
           end
         end

data/lib/resque/server.rb

@@ -5,7 +5,7 @@ require 'resque/version'
 require 'time'
 require 'yaml'
 
-if defined? Encoding
+if defined?(Encoding) && Encoding.default_external != Encoding::UTF_8
   Encoding.default_external = Encoding::UTF_8
 end
 
@@ -42,10 +42,6 @@ module Resque
       end
       alias_method :u, :url_path
 
-      def redirect_url_path(*path_parts)
-        [ path_prefix, path_parts ].join("/").squeeze('/')
-      end
-
       def path_prefix
         request.env['SCRIPT_NAME']
       end
@@ -102,6 +98,8 @@ module Resque
         Array(args).map do |a|
           a.to_yaml
         end.join("\n")
+      rescue
+        args.to_s
       end
 
       def worker_hosts
@@ -131,7 +129,7 @@ module Resque
       end
 
       def poll
-        if @polling
+        if defined?(@polling) && @polling
           text = "Last Updated: #{Time.now.strftime("%H:%M:%S")}"
         else
           text = "<a href='#{u(request.path_info)}.poll' rel='poll'>Live Poll</a>"
@@ -158,7 +156,7 @@ module Resque
 
     # to make things easier on ourselves
     get "/?" do
-      redirect redirect_url_path(:overview)
+      redirect url_path(:overview)
     end
 
     %w( overview workers ).each do |page|
@@ -219,7 +217,7 @@ module Resque
 
     post "/failed/:queue/requeue/all" do
       Resque::Failure.requeue_queue Resque::Failure.job_queue_name(params[:queue])
-      redirect redirect_url_path("/failed/#{params[:queue]}")
+      redirect url_path("/failed/#{params[:queue]}")
     end
 
     get "/failed/requeue/:index/?" do
@@ -251,7 +249,7 @@ module Resque
     end
 
     get "/stats/?" do
-      redirect redirect_url_path("/stats/resque")
+      redirect url_path("/stats/resque")
     end
 
     get "/stats/:id/?" do

data/lib/resque/server/views/failed_job.erb

@@ -6,10 +6,10 @@
     <% else %>
     <dt>Worker</dt>
     <dd>
-      <a href="<%= u(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= Time.parse(job['failed_at']).strftime(failed_date_format) %></span></b>
+      <a href="<%= u(:workers, job['worker']) %>"><%= job['worker'].split(':')[0...2].join(':') %></a> on <b class='queue-tag'><%= job['queue'] %></b > at <b><span class="time"><%= DateTime.parse(job['failed_at']).strftime(failed_date_format) %></span></b>
       <% if job['retried_at'] %>
         <div class='retried'>
-          Retried <b><span class="time"><%= Time.parse(job['retried_at']).strftime(failed_date_format) %></span></b>
+          Retried <b><span class="time"><%= DateTime.parse(job['retried_at']).strftime(failed_date_format) %></span></b>
           <a href="<%= u "#{queue}/remove/#{id}" %>" class="remove" rel="remove">Remove</a>
         </div>
       <% else %>

data/lib/resque/server/views/layout.erb

@@ -23,7 +23,7 @@
     <% end %>
   </div>
 
-  <% if @subtabs %>
+  <% if defined?(@subtabs) && @subtabs %>
     <ul class='subnav'>
       <% for subtab in @subtabs %>
         <li <%= class_if_current "#{current_section}/#{subtab}" %>><a href="<%= current_section %>/<%= subtab %>"><span><%= subtab %></span></a></li>

data/lib/resque/server/views/queues.erb

@@ -1,18 +1,18 @@
 <% @subtabs = resque.queues unless partial? || params[:id].nil? %>
 
-<% if queue = params[:id] %>
+<% if current_queue = params[:id] %>
 
-  <h1>Pending jobs on <span class='hl'><%= queue %></span></h1>
-  <form method="POST" action="<%=u "/queues/#{queue}/remove" %>" class='remove-queue'>
+  <h1>Pending jobs on <span class='hl'><%= current_queue %></span></h1>
+  <form method="POST" action="<%=u "/queues/#{current_queue}/remove" %>" class='remove-queue'>
     <input type='submit' name='' value='Remove Queue' onclick='return confirm("Are you absolutely sure? This cannot be undone.");' />
   </form>
-  <p class='sub'><%= page_entries_info start = params[:start].to_i, start + 19, size = resque.size(queue), 'job' %></p>
+  <p class='sub'><%= page_entries_info start = params[:start].to_i, start + 19, size = resque.size(current_queue), 'job' %></p>
   <table class='jobs'>
     <tr>
       <th>Class</th>
       <th>Args</th>
     </tr>
-    <% for job in (jobs = resque.peek(queue, start, 20)) %>
+    <% for job in (jobs = resque.peek(current_queue, start, 20)) %>
     <tr>
       <td class='class'><%= partial :job_class, :job => job %></td>
       <td class='args'><%=h job['args'].inspect %></td>

data/lib/resque/server/views/stats.erb

@@ -24,7 +24,7 @@
 
   <h1><%= resque.redis_id %></h1>
   <table class='stats'>
-  <% for key, value in resque.redis.info.to_a.sort_by { |i| i[0].to_s } %>
+  <% for key, value in resque.redis.redis.info.to_a.sort_by { |i| i[0].to_s } %>
     <tr>
       <th>
         <%= key %>

data/lib/resque/server/views/working.erb

@@ -1,5 +1,5 @@
-<% if params[:id] && (worker = Resque::Worker.find(params[:id])) && (data = worker.job) %>
-  <h1><%= worker %>'s job</h1>
+<% if params[:id] && (current_worker = Resque::Worker.find(params[:id])) && (data = current_worker.job) %>
+  <h1><%= current_worker %>'s job</h1>
 
   <table>
     <tr>
@@ -12,8 +12,8 @@
     </tr>
       <tr>
         <td><img src="<%=u 'working.png' %>" alt="working" title="working"></td>
-        <% host, pid, _ = worker.to_s.split(':') %>
-        <td><a href="<%=u "/workers/#{worker}" %>"><%= host %>:<%= pid %></a></td>
+        <% host, pid, _ = current_worker.to_s.split(':') %>
+        <td><a href="<%=u "/workers/#{current_worker}" %>"><%= host %>:<%= pid %></a></td>
         <% queue = data['queue'] %>
         <td><a class="queue" href="<%=u "/queues/#{queue}" %>"><%= queue %></a></td>
         <td><span class="time"><%= data['run_at'] %></span></td>
@@ -49,10 +49,10 @@
     </tr>
     <% end %>
 
-    <% worker_jobs.sort_by {|w, j| j['run_at'] ? j['run_at'].to_s() : '' }.each do |worker, job| %>
+    <% worker_jobs.sort_by { |_w, j| j['run_at'] ? j['run_at'].to_s() : '' }.each do |worker, job| %>
       <tr>
         <td class='icon'><img src="<%=u state = worker.state %>.png" alt="<%= state %>" title="<%= state %>"></td>
-        <% host, pid, queues = worker.to_s.split(':') %>
+        <% host, pid, _queues = worker.to_s.split(':') %>
         <td class='where'><a href="<%=u "/workers/#{worker}" %>"><%= host %>:<%= pid %></a></td>
         <td class='queues queue'>
           <a class="queue-tag" href="<%=u "/queues/#{job['queue']}" %>"><%= job['queue'] %></a>

data/lib/resque/stat.rb

@@ -7,12 +7,19 @@ module Resque
   #   Kill a stat: Stat.clear(name)
   module Stat
     extend self
-    
-    # Direct access to the Redis instance.
+
     def redis
-      Resque.redis
+      warn '[Resque] [Deprecation] Resque::Stat #redis method is deprecated (please use #data_strore)'
+      data_store
+    end
+
+    def data_store
+      @data_store ||= Resque.redis
+    end
+
+    def data_store=(data_store)
+      @data_store = data_store
     end
-    alias :data_store :redis
 
     # Returns the int value of a stat, given a string stat name.
     def get(stat)
@@ -42,7 +49,7 @@ module Resque
     # Can optionally accept a second int parameter. The stat is then
     # decremented by that amount.
     def decr(stat, by = 1)
-      data_store.decremet_stat(stat,by)
+      data_store.decrement_stat(stat,by)
     end
 
     # Decrements a stat by one.

data/lib/resque/tasks.rb

@@ -40,17 +40,9 @@ namespace :resque do
   # Preload app files if this is Rails
   task :preload => :setup do
     if defined?(Rails)
-      if Rails::VERSION::MAJOR > 3
+      if Rails.application.config.eager_load
         ActiveSupport.run_load_hooks(:before_eager_load, Rails.application)
         Rails.application.config.eager_load_namespaces.each(&:eager_load!)
-
-      elsif Rails::VERSION::MAJOR == 3
-        ActiveSupport.run_load_hooks(:before_eager_load, Rails.application)
-        Rails.application.eager_load!
-
-      elsif defined?(Rails::Initializer)
-        $rails_rake_task = false
-        Rails::Initializer.run :load_application_classes
       end
     end
   end

data/lib/resque/thread_signal.rb

@@ -1,45 +1,24 @@
 class Resque::ThreadSignal
-  if RUBY_VERSION <= "1.9"
-    def initialize
-      @signaled = false
-    end
+  def initialize
+    @mutex = Mutex.new
+    @signaled = false
+    @received = ConditionVariable.new
+  end
 
-    def signal
+  def signal
+    @mutex.synchronize do
       @signaled = true
+      @received.signal
     end
+  end
 
-    def wait_for_signal(timeout)
-      (10 * timeout).times do
-        sleep(0.1)
-        return true if @signaled
+  def wait_for_signal(timeout)
+    @mutex.synchronize do
+      unless @signaled
+        @received.wait(@mutex, timeout)
       end
 
       @signaled
     end
-
-  else
-    def initialize
-      @mutex = Mutex.new
-      @signaled = false
-      @received = ConditionVariable.new
-    end
-
-    def signal
-      @mutex.synchronize do
-        @signaled = true
-        @received.signal
-      end
-    end
-
-    def wait_for_signal(timeout)
-      @mutex.synchronize do
-        unless @signaled
-          @received.wait(@mutex, timeout)
-        end
-
-        @signaled
-      end
-    end
-
   end
 end

data/lib/resque/vendor/utf8_util.rb

@@ -7,7 +7,8 @@ module UTF8Util
   #
   # Returns self as valid UTF-8.
   def self.clean!(str)
-    raise NotImplementedError
+    return str if str.encoding.to_s == "UTF-8"
+    str.force_encoding("binary").encode("UTF-8", :invalid => :replace, :undef => :replace, :replace => REPLACEMENT_CHAR)
   end
 
   # Replace invalid UTF-8 character sequences with a replacement character
@@ -16,11 +17,4 @@ module UTF8Util
   def self.clean(str)
     clean!(str.dup)
   end
-
-end
-
-if RUBY_VERSION <= '1.9'
-  require 'resque/vendor/utf8_util/utf8_util_18'
-else
-  require 'resque/vendor/utf8_util/utf8_util_19'
 end

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '1.27.4'
+  Version = VERSION = '2.0.0'
 end

data/lib/resque/worker.rb

@@ -145,6 +145,9 @@ module Resque
       @paused = nil
       @before_first_fork_hook_ran = false
 
+      @heartbeat_thread = nil
+      @heartbeat_thread_signal = nil
+
       verbose_value = ENV['LOGGING'] || ENV['VERBOSE']
       self.verbose = verbose_value if verbose_value
       self.very_verbose = ENV['VVERBOSE'] if ENV['VVERBOSE']
@@ -162,9 +165,6 @@ module Resque
     # once per worker.
     def prepare
       if ENV['BACKGROUND']
-        unless Process.respond_to?('daemon')
-            abort "env var BACKGROUND is set, which requires ruby >= 1.9"
-        end
         Process.daemon(true)
       end
 
@@ -175,12 +175,12 @@ module Resque
       self.reconnect if ENV['BACKGROUND']
     end
 
+    WILDCARDS = ['*', '?', '{', '}', '[', ']'].freeze
+
     def queues=(queues)
       queues = queues.empty? ? (ENV["QUEUES"] || ENV['QUEUE']).to_s.split(',') : queues
       @queues = queues.map { |queue| queue.to_s.strip }
-      unless ['*', '?', '{', '}', '[', ']'].any? {|char| @queues.join.include?(char) }
-        @static_queues = @queues.flatten.uniq
-      end
+      @has_dynamic_queues = WILDCARDS.any? {|char| @queues.join.include?(char) }
       validate_queues
     end
 
@@ -198,12 +198,16 @@ module Resque
     # A splat ("*") means you want every queue (in alpha order) - this
     # can be useful for dynamically adding new queues.
     def queues
-      return @static_queues if @static_queues
-      @queues.map { |queue| glob_match(queue) }.flatten.uniq
+      if @has_dynamic_queues
+        current_queues = Resque.queues
+        @queues.map { |queue| glob_match(current_queues, queue) }.flatten.uniq
+      else
+        @queues
+      end
     end
 
-    def glob_match(pattern)
-      Resque.queues.select do |queue|
+    def glob_match(list, pattern)
+      list.select do |queue|
         File.fnmatch?(pattern, queue)
       end.sort
     end
@@ -588,6 +592,8 @@ module Resque
     # By checking the current Redis state against the actual
     # environment, we can determine if Redis is old and clean it up a bit.
     def prune_dead_workers
+      return unless data_store.acquire_pruning_dead_worker_lock(self, Resque.heartbeat_interval)
+
       all_workers = Worker.all
 
       unless all_workers.empty?
@@ -604,7 +610,9 @@ module Resque
         # client library or an older version of Resque. We won't touch these.
         if all_workers_with_expired_heartbeats.include?(worker)
           log_with_severity :info, "Pruning dead worker: #{worker}"
-          worker.unregister_worker(PruneDeadWorkerDirtyExit.new(worker.to_s))
+
+          job_class = worker.job(false)['payload']['class'] rescue nil
+          worker.unregister_worker(PruneDeadWorkerDirtyExit.new(worker.to_s, job_class))
           next
         end
 
@@ -635,7 +643,8 @@ module Resque
 
     # Runs a named hook, passing along any arguments.
     def run_hook(name, *args)
-      return unless hooks = Resque.send(name)
+      hooks = Resque.send(name)
+      return if hooks.empty?
       return if name == :before_first_fork && @before_first_fork_hook_ran
       msg = "Running #{name} hooks"
       msg << " with #{args.inspect}" if args.any?
@@ -808,7 +817,7 @@ module Resque
     # machine. Useful when pruning dead workers on startup.
     def windows_worker_pids
       tasklist_output = `tasklist /FI "IMAGENAME eq ruby.exe" /FO list`.encode("UTF-8", Encoding.locale_charmap)
-      tasklist_output.split($/).select { |line| line =~ /^PID:/}.collect{ |line| line.gsub /PID:\s+/, '' }
+      tasklist_output.split($/).select { |line| line =~ /^PID:/ }.collect { |line| line.gsub(/PID:\s+/, '') }
     end
 
     # Find Resque worker pids on Linux and OS X.
@@ -850,13 +859,7 @@ module Resque
     end
 
 
-    def verbose
-      @verbose
-    end
-
-    def very_verbose
-      @very_verbose
-    end
+    attr_reader :verbose, :very_verbose
 
     def verbose=(value);
       if value && !very_verbose
@@ -909,7 +912,7 @@ module Resque
         nil
       end
 
-      job.fail(DirtyExit.new("Child process received unhandled signal #{$?.stopsig}", $?)) if $?.signaled?
+      job.fail(DirtyExit.new("Child process received unhandled signal #{$?}", $?)) if $?.signaled?
       @child = nil
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque
 version: !ruby/object:Gem::Version
-  version: 1.27.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Chris Wanstrath
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-15 00:00:00.000000000 Z
+date: 2018-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: vegas
   requirement: !ruby/object:Gem::Requirement
@@ -159,8 +159,6 @@ files:
 - lib/resque/tasks.rb
 - lib/resque/thread_signal.rb
 - lib/resque/vendor/utf8_util.rb
-- lib/resque/vendor/utf8_util/utf8_util_18.rb
-- lib/resque/vendor/utf8_util/utf8_util_19.rb
 - lib/resque/version.rb
 - lib/resque/worker.rb
 - lib/tasks/redis.rake
@@ -178,7 +176,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -186,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Resque is a Redis-backed queueing system.

data/lib/resque/vendor/utf8_util/utf8_util_18.rb

@@ -1,91 +0,0 @@
-require 'strscan'
-
-module UTF8Util
-  HIGH_BIT_RANGE = /[\x80-\xff]/
-
-  # Check if this String is valid UTF-8
-  #
-  # Returns true or false.
-  def self.valid?(str)
-    sc = StringScanner.new(str)
-
-    while sc.skip_until(HIGH_BIT_RANGE)
-      sc.pos -= 1
-
-      if !sequence_length(sc)
-        return false
-      end
-    end
-
-    true
-  end
-
-  # Replace invalid UTF-8 character sequences with a replacement character
-  #
-  # Returns self as valid UTF-8.
-  def self.clean!(str)
-    sc = StringScanner.new(str)
-    while sc.skip_until(HIGH_BIT_RANGE)
-      pos = sc.pos = sc.pos-1
-
-      if !sequence_length(sc)
-        str[pos] = REPLACEMENT_CHAR
-      end
-    end
-
-    str
-  end
-
-  # Validate the UTF-8 sequence at the current scanner position.
-  #
-  # scanner - StringScanner instance so we can advance the pointer as we verify.
-  #
-  # Returns The length in bytes of this UTF-8 sequence, false if invalid.
-  def self.sequence_length(scanner)
-    leader = scanner.get_byte[0]
-
-    if (leader >> 5) == 0x6
-      if check_next_sequence(scanner)
-        return 2
-      else
-        scanner.pos -= 1
-      end
-    elsif (leader >> 4) == 0x0e
-      if check_next_sequence(scanner)
-        if check_next_sequence(scanner)
-          return 3
-        else
-          scanner.pos -= 2
-        end
-      else
-        scanner.pos -= 1
-      end
-    elsif (leader >> 3) == 0x1e
-      if check_next_sequence(scanner)
-        if check_next_sequence(scanner)
-          if check_next_sequence(scanner)
-            return 4
-          else
-            scanner.pos -= 3
-          end
-        else
-          scanner.pos -= 2
-        end
-      else
-        scanner.pos -= 1
-      end
-    end
-
-    false
-  end
-
-  private
-
-  # Read another byte off the scanner oving the scan position forward one place
-  #
-  # Returns nothing.
-  def self.check_next_sequence(scanner)
-    byte = scanner.get_byte[0]
-    (byte >> 6) == 0x2
-  end
-end

data/lib/resque/vendor/utf8_util/utf8_util_19.rb

@@ -1,6 +0,0 @@
-module UTF8Util
-  def self.clean!(str)
-    return str if str.encoding.to_s == "UTF-8"
-    str.force_encoding("binary").encode("UTF-8", :invalid => :replace, :undef => :replace, :replace => REPLACEMENT_CHAR)
-  end
-end