resque 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b930a952313756e06d51bb6daa493ebeed0c4498940e46d24300f7fafdac36b3
-  data.tar.gz: ea821158f150dbf5740dff8cb210be0f7507c1e183acd3a902308f0ef91e7f2c
+  metadata.gz: b6f395169f58a51122135f8cbf6495ca914a472a94038277d6d022ac1387459a
+  data.tar.gz: ba5b39c8521b48b0f882c2290d105dc8b2db24308cf08d14d630841ed45585ed
 SHA512:
-  metadata.gz: d266f8019b93add5de76d0d3e5a460c2a03c3fc04b3d71c65f296269c7e286875b6b1925d31d01699c952d14319164cab39062f9310314fed0b4229b92f47821
-  data.tar.gz: d375348987a655202483adb5eccb253ed07eea17d88749c04837e0ec05dad948805cb371500ac42b11650595327875f0af56e9c3501261e8223f6c1fbfff5f5f
+  metadata.gz: f03920bbf92a185a5d6c062d9d10dbc17c8b3090ed9bbd04138e85b3a40f0cefa377c21f22a343c3c9b64cd3502998efa5b42f5a6f6c7f314712ceb54bc9671e
+  data.tar.gz: af2ac4eb41bd9dc30951fd1122deada0b445000736ff08a020313e4337655c61e79af888e7b21e3c6c1cacab2e3bc5cc1f4d28577d2e2e02e62c5f8bf3452a18

data/HISTORY.md

@@ -1,15 +1,27 @@
 ## Unreleased
 
-### Added
+### Fixed
 
 *
 *
 
-### Fixed
+### Added
 
 *
 *
 
+## 2.2.0
+
+### Added
+
+* Add 'Retry Failed Jobs' button to Failed page
+
+### Fixed
+
+* Loading railtie when it did not exist #1765
+* Fix closing parent Redis connection in child process after fork
+* Fix the failed queues list on /queues UI when the RedisMultiQueue backend is used #1638
+
 ## 2.1.0
 
 ### Security

data/lib/resque/data_store.rb

@@ -76,9 +76,10 @@ module Resque
       @redis.inspect
     end
 
-    # Force a reconnect to Redis.
+    # Force a reconnect to Redis without closing the connection in the parent
+    # process after a fork.
     def reconnect
-      @redis._client.reconnect
+      @redis._client.connect
     end
 
     # Returns an array of all known Resque keys in Redis. Redis' KEYS operation

data/lib/resque/failure.rb

@@ -91,6 +91,12 @@ module Resque
       backend.clear(queue)
     end
 
+    def self.clear_retried
+      each do |index, job|
+        remove(index) unless job['retried_at'].nil?
+      end
+    end
+
     def self.requeue(id, queue = nil)
       backend.requeue(id, queue)
     end

data/lib/resque/server/helpers.rb

@@ -9,7 +9,9 @@ Resque::Server.helpers do
 
   def failed_multiple_queues?
     return @multiple_failed_queues if defined?(@multiple_failed_queues)
-    @multiple_failed_queues = Resque::Failure.queues.size > 1
+
+    @multiple_failed_queues = Resque::Failure.queues.size > 1 ||
+      (defined?(Resque::Failure::RedisMultiQueue) && Resque::Failure.backend == Resque::Failure::RedisMultiQueue)
   end
 
   def failed_size

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

@@ -8,6 +8,12 @@
 <form method="POST" action="<%= u "failed#{'/' + params[:queue] if params[:queue]}/clear" %>">
   <input type="submit" name="" value="Clear <%= params[:queue] ? "'#{params[:queue]}'" : 'Failed' %> Jobs" class="confirmSubmission" />
 </form>
+
+<% unless params[:queue] %>
+  <form method="POST" action="<%= u "failed/clear_retried" %>">
+    <input type="submit" name="" value="Clear Retried Jobs" onclick='return confirm("Are you absolutely sure? This cannot be undone.");' />
+  </form>
+<% end %>
 <form method="POST" action="<%= u "failed#{'/' + params[:queue] if params[:queue]}/requeue/all" %>">
   <input type="submit" name="" value="Retry <%= params[:queue] ? "'#{params[:queue]}'" : 'Failed' %> Jobs" class="confirmSubmission" />
 </form>

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

@@ -37,7 +37,7 @@
 </div>
 
 <div id="footer">
-  <p>Powered by <a href="http://github.com/resque/resque">Resque</a> v<%=Resque::Version%></p>
+  <p>Powered by <a href="http://github.com/resque/resque">Resque</a> v<%=Resque::VERSION%></p>
   <p>Connected to Redis namespace <%= Resque.redis.namespace %> on <%=Resque.redis_id%></p>
 </div>
 

data/lib/resque/server.rb

@@ -205,6 +205,11 @@ module Resque
       redirect u('failed')
     end
 
+    post "/failed/clear_retried" do
+      Resque::Failure.clear_retried
+      redirect u('failed')
+    end
+
     post "/failed/:queue/clear" do
       Resque::Failure.clear params[:queue]
       redirect u('failed')

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  Version = VERSION = '2.1.0'
+  VERSION = '2.2.0'
 end

data/lib/resque/worker.rb

@@ -852,7 +852,7 @@ module Resque
       `ps -A -o pid,comm | grep "[r]uby" | grep -v "resque-web"`.split("\n").map do |line|
         real_pid = line.split(' ')[0]
         pargs_command = `pargs -a #{real_pid} 2>/dev/null | grep [r]esque | grep -v "resque-web"`
-        if pargs_command.split(':')[1] == " resque-#{Resque::Version}"
+        if pargs_command.split(':')[1] == " resque-#{Resque::VERSION}"
           real_pid
         end
       end.compact
@@ -862,7 +862,7 @@ module Resque
     # Procline is always in the format of:
     #   RESQUE_PROCLINE_PREFIXresque-VERSION: STRING
     def procline(string)
-      $0 = "#{ENV['RESQUE_PROCLINE_PREFIX']}resque-#{Resque::Version}: #{string}"
+      $0 = "#{ENV['RESQUE_PROCLINE_PREFIX']}resque-#{Resque::VERSION}: #{string}"
       log_with_severity :debug, $0
     end
 

data/lib/resque.rb

@@ -23,7 +23,7 @@ require 'resque/thread_signal'
 
 require 'resque/vendor/utf8_util'
 
-require 'resque/railtie' if defined?(Rails)
+require 'resque/railtie' if defined?(Rails::Railtie)
 
 module Resque
   include Helpers

metadata

@@ -1,16 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: resque
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Chris Wanstrath
 - Steve Klabnik
 - Terence Lee
+- Michael Bianco
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-10 00:00:00.000000000 Z
+date: 2021-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis-namespace
@@ -165,10 +166,11 @@ files:
 - lib/resque/worker.rb
 - lib/tasks/redis.rake
 - lib/tasks/resque.rake
-homepage: http://resque.github.io/
+homepage: https://github.com/resque/resque
 licenses:
 - MIT
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/resque/resque/blob/master/HISTORY.md
 post_install_message:
 rdoc_options:
 - "--charset=UTF-8"