resque 3.0.3 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: acde04f0564445d35441b5d8fc947ece39fb99b181c9f67a0942ecf14c08fa8d
-  data.tar.gz: 2ed7744e0f167229c3b814d472223e8b860ddee3a20d20783cddfcb9a18f0bfe
+  metadata.gz: 47f174d6353bf3747da1ec6189f5b405717399418b421c8b071b3fa806869355
+  data.tar.gz: 573d98cd9d90a504bf1eb79e8d93b0fcd59d67bc36adc5126cbb144304e03bc3
 SHA512:
-  metadata.gz: 2269306cd35af0f83ae337d24914eb40a2945fa7d7091be12942dce5415d29ce51ace66b56669a7748a5727610a208b81dc9146934b473dfd2a404ba325a95ae
-  data.tar.gz: c69034d1674ebfde72aa382317ee390cee6ddc62d31e1c0424eab392c106b2338021330cf1a4b7d0cd8fb3004e4fabc3902956481a494264a9194c744af77a8f
+  metadata.gz: 265e97433c7e8eb1d5fcaafad19f4505fabca6580e9e727a07f1e281a7af310ddae15b6721452cd7064249f55dcdf1bfa3967ea3823b8f1c436eee91c15bb917
+  data.tar.gz: 9bce6a28a4ee107fc1f347ac92b7b885823d67a2b725fd0152ea2ad7e9b34a6003884e35330f4876a9bddf854aaa46bbec096db1766e5d653b6572b4b0f99ec9

data/HISTORY.md

@@ -1,3 +1,27 @@
+## 3.1.0
+
+### Breaking Changes
+
+* **Minimum Ruby version is now 3.2.0** - Ruby 3.0 and 3.1 are no longer supported (#1958)
+* **Minimum Redis server version is now 4.0** - key removal now uses `UNLINK` instead of `DEL` (#1962)
+
+### Added
+
+* Added `always` hooks - run after a job finishes, whether it succeeded or failed (#1966)
+* Each failure now has a unique `failure_id` (#1943)
+* resque-web: Dark mode (#1963)
+* resque-web: Delete button for queued jobs (#1969)
+* resque-web: `link` and `script` tag helpers for plugins (#1914)
+
+### Fixed
+
+* Keep the heartbeat thread alive when a heartbeat fails (#1967)
+* `Resque::Failure::Multiple` saves to every backend even when one of them raises (#1964)
+* Let Rails eager load the application rather than doing it ourselves (#1867)
+* Test the Rails and Redis versions the CI matrix claims to cover (#1978)
+* Require `minitest/mock` from its extracted gem (#1976)
+* Get on modern RuboCop (#1977)
+
 ## 3.0.3
 
 ### Fixed

data/README.markdown

@@ -39,13 +39,14 @@ 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 3.0 requires Ruby 3.0.0 or newer.
+Resque requires Ruby 3.2.0 or newer.
 
 **Version Support:**
-- Ruby: 3.0, 3.1, 3.2, 3.3, 3.4+
+- Ruby: 3.2, 3.3, 3.4, 4.0
+- Redis server: 4.0+
 - Redis gem: 4.0+
 - Rack: 2.x or 3.x
-- Rails (for ActiveJob): 7.2+ (requires Ruby 3.1+ for Rails 8.0+)
+- Rails (for ActiveJob): 7.2+
 
 ### Resque 3.0
 
@@ -431,6 +432,15 @@ Resque::Failure::Multiple.classes = [Resque::Failure::Redis, Resque::Failure::Ai
 Resque::Failure.backend = Resque::Failure::Multiple
 ```
 
+Each failure is recorded with a unique `failure_id` shared by every backend that
+accepts one, so the same failure can be correlated across them. Failures are
+still addressed by index; the id is additive metadata. See
+[docs/FAILURE_IDS.md](https://github.com/resque/resque/blob/master/docs/FAILURE_IDS.md).
+
+A backend that raises while saving no longer stops the ones after it. Once every
+backend has run, `Resque::Failure::Multiple::BackendError` is raised; its
+`original_errors` maps each failed backend class to the exception it raised.
+
 Keep this in mind when writing your jobs: you may want to throw
 exceptions you would not normally throw in order to assist debugging.
 

data/Rakefile

@@ -44,11 +44,6 @@ task "env:aj_integration" do
 end
 
 Rake::TestTask.new('test:activejob:integration' => 'env:aj_integration') do |t|
-  if Gem::Version.new(RUBY_VERSION) < Gem::Version.new("3.1")
-    puts "Integration tests require Ruby 3.1 or later"
-    exit 0
-  end
-
   t.description = "Run integration tests for Resque::ActiveJob::Adapter"
   t.libs << "test"
   t.libs << "test/active_job"

data/lib/resque/data_store.rb

@@ -133,7 +133,7 @@ module Resque
       def remove_queue(queue)
         @redis.pipelined do |piped|
           piped.srem(:queues, [queue.to_s])
-          piped.del(redis_key_for_queue(queue))
+          piped.unlink(redis_key_for_queue(queue))
         end
       end
 
@@ -178,7 +178,7 @@ module Resque
       end
 
       def remove_failed_queue(failed_queue_name=:failed)
-        @redis.del(failed_queue_name)
+        @redis.unlink(failed_queue_name)
       end
 
       def num_failed(failed_queue_name=:failed)
@@ -198,7 +198,7 @@ module Resque
       end
 
       def clear_failed_queue(failed_queue_name=:failed)
-        @redis.del(failed_queue_name)
+        @redis.unlink(failed_queue_name)
       end
 
       def update_item_in_failed_queue(index_in_failed_queue,new_item_data,failed_queue_name=:failed)
@@ -252,8 +252,8 @@ module Resque
       def unregister_worker(worker, &block)
         @redis.pipelined do |piped|
           piped.srem(:workers, [worker.id])
-          piped.del(redis_key_for_worker(worker))
-          piped.del(redis_key_for_worker_start_time(worker))
+          piped.unlink(redis_key_for_worker(worker))
+          piped.unlink(redis_key_for_worker_start_time(worker))
           piped.hdel(HEARTBEAT_KEY, worker.to_s)
 
           block.call redis: piped
@@ -291,7 +291,7 @@ module Resque
 
       def worker_done_working(worker, &block)
         @redis.pipelined do |piped|
-          piped.del(redis_key_for_worker(worker))
+          piped.unlink(redis_key_for_worker(worker))
           block.call redis: piped
         end
       end
@@ -328,7 +328,7 @@ module Resque
       end
 
       def clear_stat(stat, redis: @redis)
-        redis.del("stat:#{stat}")
+        redis.unlink("stat:#{stat}")
       end
     end
   end

data/lib/resque/failure/base.rb

@@ -17,11 +17,16 @@ module Resque
       # The payload object associated with the failed job
       attr_accessor :payload
 
+      # A unique identifier for this failure, shared by every backend that
+      # accepts one. Nil when generation is turned off.
+      attr_accessor :failure_id
+
       def initialize(exception, worker, queue, payload)
         @exception = exception
         @worker    = worker
         @queue     = queue
         @payload   = payload
+        @failure_id = SecureRandom.uuid if Resque::Failure.generate_failure_ids?
       end
 
       # When a job fails, a new instance of your Failure backend is created

data/lib/resque/failure/multiple.rb

@@ -3,6 +3,17 @@ module Resque
     # A Failure backend that uses multiple backends
     # delegates all queries to the first backend
     class Multiple < Base
+      class BackendError < StandardError
+        attr_reader :original_errors
+
+        def initialize(original_errors = {})
+          @original_errors = original_errors
+          message = "Some backends raise error: " + @original_errors.map{|backend, e|
+            "#{backend}:#{e.class}:#{e.message.inspect}"
+          }.join("; ")
+          super(message)
+        end
+      end
 
       class << self
         attr_accessor :classes
@@ -19,7 +30,18 @@ module Resque
       end
 
       def save
-        @backends.each(&:save)
+        errors = {}
+
+        @backends.each do |backend|
+          backend.failure_id = failure_id if backend.respond_to?(:failure_id=)
+          backend.save
+        rescue
+          errors[backend.class] = $!
+        end
+
+        unless errors.empty?
+          raise BackendError.new(errors)
+        end
       end
 
       # The number of failures.

data/lib/resque/failure/redis.rb

@@ -22,6 +22,7 @@ module Resque
           :worker    => worker.to_s,
           :queue     => queue
         }
+        data[:failure_id] = failure_id if failure_id
         data = Resque.encode(data)
         data_store.push_to_failed_queue(data)
       end

data/lib/resque/failure/redis_multi_queue.rb

@@ -22,6 +22,7 @@ module Resque
           :worker    => worker.to_s,
           :queue     => queue
         }
+        data[:failure_id] = failure_id if failure_id
         data = Resque.encode(data)
         data_store.push_to_failed_queue(data,Resque::Failure.failure_queue_name(queue))
       end

data/lib/resque/failure.rb

@@ -9,12 +9,33 @@ module Resque
     # Creates a new failure, which is delegated to the appropriate backend.
     #
     # Expects a hash with the following keys:
-    #   :exception - The Exception object
-    #   :worker    - The Worker object who is reporting the failure
-    #   :queue     - The string name of the queue from which the job was pulled
-    #   :payload   - The job's payload
+    #   :exception  - The Exception object
+    #   :worker     - The Worker object who is reporting the failure
+    #   :queue      - The string name of the queue from which the job was pulled
+    #   :payload    - The job's payload
+    #   :failure_id - Optional id to record this failure under, in place of the
+    #                 one the backend generates for itself.
     def self.create(options = {})
-      backend.new(*options.values_at(:exception, :worker, :queue, :payload)).save
+      failure = backend.new(*options.values_at(:exception, :worker, :queue, :payload))
+
+      # Backends are not required to accept an id.
+      if options[:failure_id] && failure.respond_to?(:failure_id=)
+        failure.failure_id = options[:failure_id]
+      end
+
+      failure.save
+    end
+
+    class << self
+      attr_writer :generate_failure_ids
+
+      # Whether failures are given a `failure_id` when they are built.
+      # Defaults to true. An explicit `:failure_id` passed to `create` sets the
+      # `failure_id` even if automatic generation is disabled.
+      def generate_failure_ids?
+        return true if @generate_failure_ids.nil?
+        !!@generate_failure_ids
+      end
     end
 
     #

data/lib/resque/job.rb

@@ -201,6 +201,8 @@ module Resque
       rescue Object => e
         run_failure_hooks(e)
         raise e
+      ensure
+        run_always_hooks($!)
       end
     end
 
@@ -278,6 +280,10 @@ module Resque
       @failure_hooks ||= Plugin.failure_hooks(payload_class)
     end
 
+    def always_hooks
+      @always_hooks ||= Plugin.always_hooks(payload_class)
+    end
+
     def run_failure_hooks(exception)
       begin
         job_args = args || []
@@ -292,5 +298,17 @@ module Resque
         @failure_hooks_ran = true
       end
     end
+
+    def run_always_hooks(job_failure = nil)
+      job_args = args || []
+      always_hooks.each { |hook| payload_class.send(hook, *job_args) } if has_payload_class?
+    rescue Exception => e
+      if job_failure
+        error_message = "Additional error (#{e.class}: #{e}) occurred in running always hooks for job #{inspect}\n" \
+          "Original error that caused job failure was #{e.class}: #{job_failure.class}: #{job_failure.message}"
+        raise RuntimeError.new(error_message)
+      end
+      raise e
+    end
   end
 end

data/lib/resque/plugin.rb

@@ -55,6 +55,11 @@ module Resque
       get_hook_names(job, 'on_failure')
     end
 
+    # Given an object, returns a list of `always` hook names
+    def always_hooks(job)
+      get_hook_names(job, 'always')
+    end
+
     # Given an object, returns a list `after_enqueue` hook names.
     def after_enqueue_hooks(job)
       get_hook_names(job, 'after_enqueue')

data/lib/resque/server/public/ranger.js

@@ -1,6 +1,44 @@
+// Theme toggle functionality
+(function() {
+  // Reading localStorage throws outright when the browser blocks site data,
+  // and this runs before the rest of the file.
+  var storedTheme;
+  try {
+    storedTheme = localStorage.getItem('resque-theme');
+  } catch (e) {
+    return;
+  }
+  if (storedTheme) {
+    document.documentElement.setAttribute('data-theme', storedTheme);
+  }
+})();
+
 $(function() {
   var poll_interval = 2
 
+  // Theme toggle handler
+  $('.theme-toggle').click(function() {
+    var html = document.documentElement;
+    var currentTheme = html.getAttribute('data-theme');
+    var prefersDark = window.matchMedia('(prefers-color-scheme: dark)').matches;
+    var newTheme;
+
+    if (currentTheme === 'dark') {
+      newTheme = 'light';
+    } else if (currentTheme === 'light') {
+      newTheme = 'dark';
+    } else {
+      // No explicit theme set, toggle from system preference
+      newTheme = prefersDark ? 'light' : 'dark';
+    }
+
+    html.setAttribute('data-theme', newTheme);
+    try {
+      localStorage.setItem('resque-theme', newTheme);
+    } catch (e) {}
+    return false;
+  });
+
   var relatizer = function(){
     var dt = $(this).text(), relatized = $.relatizeDate(this)
     if ($(this).parents("a").length > 0 || $(this).is("a")) {

data/lib/resque/server/public/style.css

@@ -1,91 +1,201 @@
-html { background:#efefef; font-family:Arial, Verdana, sans-serif; font-size:13px; }
+:root {
+  --bg-primary: #efefef;
+  --bg-secondary: #fff;
+  --bg-header: #000;
+  --bg-header-hover: #333;
+  --bg-table-header: #efefef;
+  --bg-highlight: #efefef;
+  --bg-working: #f4ffe4;
+  --bg-failure: #ffecec;
+  --bg-queue-tag: #b1d2e9;
+  --bg-pagination: #efefef;
+  --text-pagination: #555;
+  --bg-failed-item: linear-gradient(to bottom, #efefef, #fff);
+  --bg-subnav-link: #dd5b5b;
+  --accent: #ce1212;
+  --accent-dark: #b00909;
+  --text-primary: #111;
+  --text-secondary: #888;
+  --text-muted: #999;
+  --text-header: #333;
+  --text-white: #fff;
+  --text-working: #7ac312;
+  --text-failure: #d37474;
+  --text-queue-tag: #3274a2;
+  --border-color: #ccc;
+  --border-footer: #ccc;
+}
+
+@media (prefers-color-scheme: dark) {
+  :root:not([data-theme="light"]) {
+    --bg-primary: #1a1a1a;
+    --bg-secondary: #2d2d2d;
+    --bg-header: #0d0d0d;
+    --bg-header-hover: #444;
+    --bg-table-header: #333;
+    --bg-highlight: #3a3a3a;
+    --bg-working: #1a2e0a;
+    --bg-failure: #3d1a1a;
+    --bg-queue-tag: #1a3a4d;
+    --bg-pagination: #333;
+    --text-pagination: #bbb;
+    --bg-failed-item: linear-gradient(to bottom, #333, #2d2d2d);
+    --bg-subnav-link: #8b3a3a;
+    --text-primary: #e0e0e0;
+    --text-secondary: #aaa;
+    --text-muted: #888;
+    --text-header: #ccc;
+    --text-working: #8fd14f;
+    --text-failure: #e88;
+    --text-queue-tag: #6ab0e0;
+    --border-color: #555;
+    --border-footer: #444;
+  }
+}
+
+[data-theme="dark"] {
+  --bg-primary: #1a1a1a;
+  --bg-secondary: #2d2d2d;
+  --bg-header: #0d0d0d;
+  --bg-header-hover: #444;
+  --bg-table-header: #333;
+  --bg-highlight: #3a3a3a;
+  --bg-working: #1a2e0a;
+  --bg-failure: #3d1a1a;
+  --bg-queue-tag: #1a3a4d;
+  --bg-pagination: #333;
+  --text-pagination: #bbb;
+  --bg-failed-item: linear-gradient(to bottom, #333, #2d2d2d);
+  --bg-subnav-link: #8b3a3a;
+  --text-primary: #e0e0e0;
+  --text-secondary: #aaa;
+  --text-muted: #888;
+  --text-header: #ccc;
+  --text-working: #8fd14f;
+  --text-failure: #e88;
+  --text-queue-tag: #6ab0e0;
+  --border-color: #555;
+  --border-footer: #444;
+}
+
+html { background: var(--bg-primary); font-family:Arial, Verdana, sans-serif; font-size:13px; }
 body { padding:0; margin:0; }
 
-.header { background:#000; padding:8px 5% 0 5%; border-bottom:1px solid #444;border-bottom:5px solid #ce1212;}
-.header h1 { color:#333; font-size:90%; font-weight:bold; margin-bottom:6px;}
+.header { background: var(--bg-header); padding:8px 5% 0 5%; border-bottom:5px solid var(--accent); position: relative;}
+.header h1 { color: var(--text-header); font-size:90%; font-weight:bold; margin-bottom:6px;}
 .header ul li { display:inline;}
-.header ul li a { color:#fff; text-decoration:none; margin-right:10px; display:inline-block;  padding:8px; -webkit-border-top-right-radius:6px; -webkit-border-top-left-radius:6px; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; }
-.header ul li a:hover { background:#333;}
-.header ul li.current a { background:#ce1212; font-weight:bold; color:#fff;}
+.header ul li a { color: var(--text-white); text-decoration:none; margin-right:10px; display:inline-block;  padding:8px; -webkit-border-top-right-radius:6px; -webkit-border-top-left-radius:6px; -moz-border-radius-topleft:6px; -moz-border-radius-topright:6px; }
+.header ul li a:hover { background: var(--bg-header-hover);}
+.header ul li.current a { background: var(--accent); font-weight:bold; color: var(--text-white);}
 
-.header .namespace { position: absolute; right: 75px; top: 12px; color: #FFF; font-weight: bold; }
+.header .namespace { position: absolute; right: 50px; top: 12px; color: var(--text-white); font-weight: bold; }
 
-.subnav { padding:2px 5% 7px 5%; background:#ce1212; font-size:90%;}
+.subnav { padding:2px 5% 7px 5%; background: var(--accent); font-size:90%;}
 .subnav li { display:inline;}
-.subnav li a { color:#fff; text-decoration:none; margin-right:10px; display:inline-block; background:#dd5b5b; padding:5px; -webkit-border-radius:3px; -moz-border-radius:3px;}
-.subnav li.current a { background:#fff; font-weight:bold; color:#ce1212;}
-.subnav li a:active { background:#b00909;}
+.subnav li a { color: var(--text-white); text-decoration:none; margin-right:10px; display:inline-block; background: var(--bg-subnav-link); padding:5px; -webkit-border-radius:3px; -moz-border-radius:3px;}
+.subnav li.current a { background: var(--bg-secondary); font-weight:bold; color: var(--accent);}
+.subnav li a:active { background: var(--accent-dark);}
 
-#main { padding:10px 5%; background:#fff; overflow:hidden; }
+#main { padding:10px 5%; background: var(--bg-secondary); overflow:hidden; }
 #main .logo { float:right; margin:10px;}
-#main span.hl { background:#efefef; padding:2px;}
-#main h1 { margin:10px 0; font-size:190%; font-weight:bold; color:#ce1212;}
-#main h2 { margin:10px 0; font-size:130%;}
+#main span.hl { background: var(--bg-highlight); padding:2px;}
+#main h1 { margin:10px 0; font-size:190%; font-weight:bold; color: var(--accent);}
+#main h2 { margin:10px 0; font-size:130%; color: var(--text-primary);}
 #main table { width:100%; margin:10px 0;}
-#main table tr td, #main table tr th { border:1px solid #ccc; padding:6px;}
-#main table tr th { background:#efefef; color:#888; font-size:15px; font-weight:bold;}
-#main table tr td.no-data { text-align:center; padding:40px 0; color:#999; font-style:italic; font-size:130%;}
-#main a { color:#111;}
-#main p { margin:5px 0;}
-#main p.intro { margin-bottom:15px; font-size:85%; color:#999; margin-top:0; line-height:1.3;}
+#main table tr td, #main table tr th { border:1px solid var(--border-color); padding:6px;}
+#main table tr th { background: var(--bg-table-header); color: var(--text-secondary); font-size:15px; font-weight:bold;}
+#main table tr td { background: var(--bg-secondary); color: var(--text-primary);}
+#main table tr td.no-data { text-align:center; padding:40px 0; color: var(--text-muted); font-style:italic; font-size:130%;}
+#main a { color: var(--text-primary);}
+#main p { margin:5px 0; color: var(--text-primary);}
+#main p.intro { margin-bottom:15px; font-size:85%; color: var(--text-muted); margin-top:0; line-height:1.3;}
 #main h1.wi { margin-bottom:5px;}
-#main p.sub { font-size:95%; color:#999;}
+#main p.sub { font-size:95%; color: var(--text-muted);}
 
 #main table.queues { width:40%;}
 #main table.queues td.queue { font-weight:bold; width:50%;}
-#main table.queues tr.failure td { background:#ffecec; font-size:90%; color:#d37474;}
-#main table.queues tr.failure td a{ color:#d37474;}
-#main table.queues tr.first_failure td { border-top:2px solid #d37474; }
+#main table.queues tr.failure td { background: var(--bg-failure); font-size:90%; color: var(--text-failure);}
+#main table.queues tr.failure td a{ color: var(--text-failure);}
+#main table.queues tr.first_failure td { border-top:2px solid var(--text-failure); }
 
 #main table.jobs td.class { font-family:Monaco, "Courier New", monospace; font-size:90%; width:50%;}
 #main table.jobs td.args{ width:50%;}
+#main table.jobs td.remove-job { width:1%; text-align:right;}
+#main table.jobs td.remove-job form { float:none; margin:0;}
 
-#main table.workers td.icon {width:1%; background:#efefef;text-align:center;}
+#main table.workers td.icon {width:1%; background: var(--bg-highlight);text-align:center;}
 #main table.workers td.icon img { height: 16px; width: 16px; }
 #main table.workers td.where { width:25%;}
 #main table.workers td.queues { width:35%;}
-#main .queue-tag { background:#b1d2e9; padding:2px; margin:0 3px; font-size:80%; text-decoration:none; text-transform:uppercase; font-weight:bold; color:#3274a2; -webkit-border-radius:4px; -moz-border-radius:4px;}
-#main .queue-tag a { color: #3274A2; text-decoration: none; }
+#main .queue-tag { background: var(--bg-queue-tag); padding:2px; margin:0 3px; font-size:80%; text-decoration:none; text-transform:uppercase; font-weight:bold; color: var(--text-queue-tag); -webkit-border-radius:4px; -moz-border-radius:4px;}
+#main .queue-tag a { color: var(--text-queue-tag); text-decoration: none; }
 #main table.workers td.queues.queue { width:10%;}
 #main table.workers td.process { width:35%;}
-#main table.workers td.process span.waiting { color:#999; font-size:90%;}
+#main table.workers td.process span.waiting { color: var(--text-muted); font-size:90%;}
 #main table.workers td.process small { font-size:80%; margin-left:5px;}
 #main table.workers td.process code { font-family:Monaco, "Courier New", monospace; font-size:90%;}
-#main table.workers td.process small a { color:#999;}
-#main.polling table.workers tr.working td { background:#f4ffe4; color:#7ac312;}
-#main.polling table.workers tr.working td.where a { color:#7ac312;}
+#main table.workers td.process small a { color: var(--text-muted);}
+#main.polling table.workers tr.working td { background: var(--bg-working); color: var(--text-working);}
+#main.polling table.workers tr.working td.where a { color: var(--text-working);}
 #main.polling table.workers tr.working td.process code { font-weight:bold;}
 
 
-#main table.stats th { font-size:100%; width:40%; color:#000;}
-#main hr { border:0; border-top:5px solid #efefef;  margin:15px 0;}
+#main table.stats th { font-size:100%; width:40%; color: var(--text-primary);}
+#main hr { border:0; border-top:5px solid var(--bg-highlight);  margin:15px 0;}
 
-#footer { padding:10px 5%; background:#efefef; color:#999; font-size:85%; line-height:1.5; border-top:5px solid #ccc; padding-top:10px;}
-#footer p a { color:#999;}
+#footer { padding:10px 5%; background: var(--bg-primary); color: var(--text-muted); font-size:85%; line-height:1.5; border-top:5px solid var(--border-footer); padding-top:10px;}
+#footer p a { color: var(--text-muted);}
 
 #main p.poll { background:url(poll.png) no-repeat 0 2px; padding:3px 0; padding-left:23px; float:right; font-size:85%; }
 
 #main ul.failed {}
-#main ul.failed li {background:-webkit-gradient(linear, left top, left bottom, from(#efefef), to(#fff)) #efefef; margin-top:10px; padding:10px; overflow:hidden; -webkit-border-radius:5px; border:1px solid #ccc; }
-#main ul.failed li dl dt {font-size:80%; color:#999; width:60px; float:left; padding-top:1px; text-align:right;}
-#main ul.failed li dl dd {margin-bottom:10px; margin-left:70px;}
+#main ul.failed li {background: var(--bg-failed-item); background-color: var(--bg-highlight); margin-top:10px; padding:10px; overflow:hidden; -webkit-border-radius:5px; border:1px solid var(--border-color); }
+#main ul.failed li dl dt {font-size:80%; color: var(--text-muted); width:60px; float:left; padding-top:1px; text-align:right;}
+#main ul.failed li dl dd {margin-bottom:10px; margin-left:70px; color: var(--text-primary);}
 #main ul.failed li dl dd .retried { float:right; text-align: right; }
 #main ul.failed li dl dd .retried .remove { display:none; margin-top: 8px; }
 #main ul.failed li.hover dl dd .retried .remove { display:block; }
 #main ul.failed li dl dd .controls { display:none; float:right; }
 #main ul.failed li.hover dl dd .controls { display:block; }
-#main ul.failed li dl dd code, #main ul.failed li dl dd pre { font-family:Monaco, "Courier New", monospace; font-size:90%; white-space: pre-wrap;}
+#main ul.failed li dl dd code, #main ul.failed li dl dd pre { font-family:Monaco, "Courier New", monospace; font-size:90%; white-space: pre-wrap; color: var(--text-primary);}
 #main ul.failed li dl dd.error a {font-family:Monaco, "Courier New", monospace; font-size:90%; }
 #main ul.failed li dl dd.error pre { margin-top:3px; line-height:1.3;}
 
-#main div.pagination { background:#efefef; padding:10px;  text-align:center}
-#main div.pagination a, #main div.pagination span { display: inline-block; padding: 4px 8px; color: #555; border: solid 1px #555; margin-top: 6px; }
-#main div.pagination span { background: #555; color: white; }
+#main div.pagination { background: var(--bg-pagination); padding:10px;  text-align:center}
+#main div.pagination a, #main div.pagination span { display: inline-block; padding: 4px 8px; color: var(--text-pagination); border: solid 1px var(--text-pagination); margin-top: 6px; }
+#main div.pagination span { background: var(--text-pagination); color: var(--bg-secondary); }
 
 #main form {float:right; margin-top:-10px;margin-left:10px;}
 
 #main .time a.toggle_format {text-decoration:none;}
 
-#failed tr.total td {background-color: #FFECEC; color: #D37474; font-size: 15px; font-weight: bold;}
+#failed tr.total td {background-color: var(--bg-failure); color: var(--text-failure); font-size: 15px; font-weight: bold;}
 #failed .center {text-align: center;}
 #failed .failed_class { padding-left: 20px; font-size:12px; }
+
+/* Theme toggle button */
+.theme-toggle {
+  position: absolute;
+  right: 15px;
+  top: 10px;
+  background: transparent;
+  border: none;
+  cursor: pointer;
+  padding: 5px;
+  font-size: 18px;
+  line-height: 1;
+  color: var(--text-white);
+  opacity: 0.8;
+  transition: opacity 0.2s;
+}
+.theme-toggle:hover {
+  opacity: 1;
+}
+.theme-toggle .sun { display: none; }
+.theme-toggle .moon { display: inline; }
+[data-theme="dark"] .theme-toggle .sun { display: inline; }
+[data-theme="dark"] .theme-toggle .moon { display: none; }
+@media (prefers-color-scheme: dark) {
+  :root:not([data-theme="light"]) .theme-toggle .sun { display: inline; }
+  :root:not([data-theme="light"]) .theme-toggle .moon { display: none; }
+}

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

@@ -3,12 +3,12 @@
 <head>
   <meta charset="utf-8" />
   <title>Resque</title>
-  <link href="<%=u 'reset.css' %>" media="screen" rel="stylesheet" type="text/css">
-  <link href="<%=u 'style.css' %>" media="screen" rel="stylesheet" type="text/css">
-  <script src="<%=u 'jquery-3.6.0.min.js' %>" type="text/javascript"></script>
-  <script src="<%=u 'jquery.relatize_date.js' %>" type="text/javascript"></script>
-  <script src="<%=u 'ranger.js' %>" type="text/javascript"></script>
-  <script src="<%=u 'main.js' %>" type="text/javascript"></script>
+  <%= link_tag 'reset.css' %>
+  <%= link_tag 'style.css' %>
+  <%= script_tag 'jquery-3.6.0.min.js' %>
+  <%= script_tag 'jquery.relatize_date.js' %>
+  <%= script_tag 'ranger.js' %>
+  <%= script_tag 'main.js' %>
 </head>
 <body>
   <div class="header">
@@ -17,6 +17,10 @@
         <%= tab tab_name %>
       <% end %>
     </ul>
+    <button class="theme-toggle" title="Toggle dark/light mode" aria-label="Toggle dark/light mode">
+      <span class="sun">&#9728;</span>
+      <span class="moon">&#9790;</span>
+    </button>
     <% if Resque.redis.namespace != :resque %>
       <abbr class="namespace" title="Resque's Redis Namespace">
        <%= h Resque.redis.namespace %>

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

@@ -11,16 +11,23 @@
     <tr>
       <th>Class</th>
       <th>Args</th>
+      <th>&nbsp;</th>
     </tr>
     <% 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>
+      <td class='remove-job'>
+        <form method="POST" action="<%= h u("/queues/#{current_queue}/remove-job") %>">
+          <input type="hidden" name="payload" value="<%= h Resque.encode(job) %>" />
+          <input type="submit" name="" value="Delete" class="confirmSubmission" />
+        </form>
+      </td>
     </tr>
     <% end %>
     <% if jobs.empty? %>
     <tr>
-      <td class='no-data' colspan='2'>There are no pending jobs in this queue</td>
+      <td class='no-data' colspan='3'>There are no pending jobs in this queue</td>
     </tr>
     <% end %>
   </table>

data/lib/resque/server.rb

@@ -73,6 +73,21 @@ module Resque
       redirect u('queues')
     end
 
+    post "/queues/:id/remove-job" do
+      halt 400, 'Missing job payload' if params[:payload].to_s.empty?
+
+      begin
+        # Round-tripped so the value removed is encoded exactly the way the
+        # queue holds it, whatever the form sent.
+        payload = Resque.encode(Resque.decode(params[:payload]))
+      rescue Resque::Helpers::DecodeException
+        halt 400, 'Invalid job payload'
+      end
+
+      Resque.data_store.remove_from_queue(params[:id], payload)
+      redirect u("queues/#{params[:id]}")
+    end
+
     get "/failed/?" do
       if Resque::Failure.url
         redirect Resque::Failure.url

data/lib/resque/server_helper.rb

@@ -18,6 +18,14 @@ module Resque
     end
     alias_method :u, :url_path
 
+    def script_tag(src)
+      %Q(<script src="#{url_path(src)}" type="text/javascript"></script>)
+    end
+
+    def link_tag(src)
+      %Q(<link href="#{url_path(src)}" media="screen" rel="stylesheet" type="text/css">)
+    end
+
     def path_prefix
       request.env['SCRIPT_NAME']
     end

data/lib/resque/tasks.rb

@@ -41,15 +41,8 @@ namespace :resque do
     threads.each { |thread| thread.join }
   end
 
-  # Preload app files if this is Rails
-  task :preload => :setup do
-    if defined?(Rails) && Rails.respond_to?(:application)
-      if Rails.application.config.eager_load
-        ActiveSupport.run_load_hooks(:before_eager_load, Rails.application)
-        Rails.application.config.eager_load_namespaces.each(&:eager_load!)
-      end
-    end
-  end
+  # Defined for backwards compatibility.
+  task :preload => :setup
 
   namespace :failures do
     desc "Sort the 'failed' queue for the redis_multi_queue failure backend"

data/lib/resque/version.rb

@@ -1,3 +1,3 @@
 module Resque
-  VERSION = '3.0.3'
+  VERSION = '3.1.0'
 end

data/lib/resque/worker.rb

@@ -553,7 +553,15 @@ module Resque
 
       @heartbeat_thread = Thread.new do
         loop do
-          heartbeat!
+          begin
+            heartbeat!
+          rescue => e
+            # A raise here would kill the thread and stop the worker
+            # heartbeating, but the worker itself keeps running and is then
+            # pruned out from under itself.
+            log_with_severity :error, "Failed to heartbeat: #{e.class}: #{e.message}"
+          end
+
           signaled = @heartbeat_thread_signal.wait_for_signal(Resque.heartbeat_interval)
           break if signaled
         end

data/lib/resque.rb

@@ -1,6 +1,7 @@
 require 'mono_logger'
 require 'redis/namespace'
 require 'forwardable'
+require 'securerandom'
 
 require 'resque/version'
 

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: resque
 version: !ruby/object:Gem::Version
-  version: 3.0.3
+  version: 3.1.0
 platform: ruby
 authors:
 - Chris Wanstrath
 - Steve Klabnik
 - Terence Lee
 - Michael Bianco
+- Patrick Tulskie
 bindir: bin
 cert_chain: []
 date: 1980-01-02 00:00:00.000000000 Z
@@ -153,7 +154,9 @@ description: |2
       * A Ruby library for creating, querying, and processing jobs
       * A Rake task for starting a worker which processes jobs
       * A Sinatra app for monitoring queues, jobs, and workers.
-email: steve@steveklabnik.com
+email:
+- steve@steveklabnik.com
+- PatrickTulskie@gmail.com
 executables:
 - resque
 - resque-web
@@ -236,7 +239,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="