resque-scheduler 5.0.0 → 5.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e23e91d3c9920396d8feaad257fe4a27f4ff269f6cd0d6f9756016599d7cdf27
-  data.tar.gz: 7c1c242fd5c2ed74f8c15924d476775f76ed4929fb65d31b965e708c5949a601
+  metadata.gz: 046040c8fa18b0cb7aabc7fdc46ff008f7b0c30f9aa0500137f5c6c987bdbabc
+  data.tar.gz: b3e243c3c9ccefa0c1282b492b70a9b26677fa2b4be6ead096e339c721d9f86a
 SHA512:
-  metadata.gz: c90721652b59bdc1f2572975d3ef93ed9aa420f36a6a8f3a0c5a35f17a3e5145ebdd30bfacf7d62e4903f9477319282c8a33d55080f5c870c84161f4933e79d4
-  data.tar.gz: 061fc1d3dfea48a20db7e8c11b31fe0b2e6594d9be0ed5c202c38f304941bceb8c1f15497d0c0ec886c0ddd37fc867b6dd1b5e143e9bb5961cd01b41f73d2e5e
+  metadata.gz: 8b6c3caa8b47c24aee900d2c348cabb20d1a32a5fce88e02a974649ca6c711b1703562393902c7638e14c1a11180b1901b126480e905c7cca8b2dbd47d27daa3
+  data.tar.gz: 7b2665804103943b3bf9a98b84134ba71a0ac00ace8e0c2ed7c765873445c801bea14c8ae9082fec4133e6f3be0314bdf1485ecd47c7bab8aba6d8d85ef36ec8

data/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 **ATTN**: This project uses [semantic versioning](http://semver.org/).
 
+## [5.0.1] - 2026-10-11
+### Changed
+* Pipeline `count_all_scheduled_jobs` for significantly faster execution by @top-sigrid in #822
+* Avoid unnecessary reloads in static mode by @ekmartin in #823
+
+### Fixed
+* Skip invalid schedules without interrupting scheduler loading by @taf2 in #543
+* Encode a delayed job once so its timestamps key can be cleaned up by @kamaljoshi in #827 (originally #599)
+* Log to the logfile when backgrounded by @meatballhat in #828 (originally #568)
+* Require redis before using its error classes by @neuromanskie in #829
+* Fix flaky test by using strings instead of symbols for JSON-serialized args by @top-sigrid in #813
+
+### Security
+* Escape job class and queue names in the scheduler web UI by @PatrickTulskie in #830
+* Escape schedule names and parameters on the requeue params page by @PatrickTulskie in #831
+* Escape the scheduler environment and master lock holder on the schedule page by @PatrickTulskie in #832
+
 ## [5.0.0] - 2026-01-15
 ### Breaking Changes
 * Ruby requirement: `>= 2.3.0` → `>= 3.0.0`
@@ -32,7 +49,7 @@
 * Fixed test compatibility with Rack 3 by @PatrickTulskie in #809
 * Fixed race condition in scheduler task tests by @PatrickTulskie in #809
 
-## [4.10.3] - 2024-12-30
+## [4.11.0] - 2024-12-30
 ### Added
 * Expose timeout for lock via environment variable configuration by @pmm4654 in #786
 * Add Ruby 3.3 to the CI matrix by @santiagorodriguez96 in #797

data/lib/resque/scheduler/delaying_extensions.rb

@@ -83,11 +83,13 @@ module Resque
       # insertion time complexity is O(log(n)). Returns true if it's
       # the first job to be scheduled at that time, else false.
       def delayed_push(timestamp, item)
+        encoded_job = encode(item)
+
         # First add this item to the list for this timestamp
-        redis.rpush("delayed:#{timestamp.to_i}", encode(item))
+        redis.rpush("delayed:#{timestamp.to_i}", encoded_job)
 
         # Store the timestamps at with this item occurs
-        redis.sadd("timestamps:#{encode(item)}", ["delayed:#{timestamp.to_i}"])
+        redis.sadd("timestamps:#{encoded_job}", ["delayed:#{timestamp.to_i}"])
 
         # Now, add this timestamp to the zsets.  The score and the value are
         # the same since we'll be querying by timestamp, and we don't have
@@ -261,12 +263,18 @@ module Resque
         count
       end
 
+      # Counts all jobs across all delayed timestamps.
+      # Uses pipelined LLEN calls in batches to avoid blocking the Redis thread
+      # for too long while being significantly faster than sequential calls.
       def count_all_scheduled_jobs
-        total_jobs = 0
-        Array(redis.zrange(:delayed_queue_schedule, 0, -1)).each do |ts|
-          total_jobs += redis.llen("delayed:#{ts}").to_i
+        timestamps = Array(redis.zrange(:delayed_queue_schedule, 0, -1))
+        return 0 if timestamps.empty?
+
+        timestamps.each_slice(10_000).sum do |batch|
+          redis.pipelined do |pipeline|
+            batch.each { |ts| pipeline.llen("delayed:#{ts}") }
+          end.sum
         end
-        total_jobs
       end
 
       # Discover if a job has been delayed.

data/lib/resque/scheduler/env.rb

@@ -30,18 +30,18 @@ module Resque
       def setup_backgrounding
         return unless options[:background]
 
-        # Need to set this here for conditional Process.daemon redirect of
-        # stderr/stdout to /dev/null
-        Resque::Scheduler.quiet = if options.key?(:quiet)
-                                    !!options[:quiet]
-                                  else
-                                    true
-                                  end
+        Resque::Scheduler.quiet = background_quiet?
 
         Process.daemon(true, !Resque::Scheduler.quiet)
         Resque.redis.reconnect
       end
 
+      def background_quiet?
+        return !!options[:quiet] if options.key?(:quiet)
+        return false if options.key?(:logfile)
+        !!options[:background]
+      end
+
       def setup_pid_file
         return unless options[:pidfile]
 

data/lib/resque/scheduler/server/views/delayed_timestamp.erb

@@ -12,7 +12,7 @@
   <% jobs = resque.delayed_timestamp_peek(timestamp, start, 20) %>
   <% jobs.each do |job| %>
     <tr>
-      <td class='class'><%= job['class'] %></td>
+      <td class='class'><%= h job['class'] %></td>
       <td class='args'><%= h show_job_arguments(job['args']) %></td>
     </tr>
   <% end %>

data/lib/resque/scheduler/server/views/requeue-params.erb

@@ -1,4 +1,4 @@
-<h1><%= @job_name %></h1>
+<h1><%= h @job_name %></h1>
 
 <p class='intro'>
    This job requires parameters:
@@ -10,14 +10,14 @@
   <% value ||= {} %>
     <tr>
       <td>
-        <%= key %>
+        <%= h key %>
         <% if value['description'] || value[:description] %>
-          <span style="border-bottom:1px dotted;" title="<%=value ['description'] || value[:description] %>">(?)</span>
+          <span style="border-bottom:1px dotted;" title="<%= h(value['description'] || value[:description]) %>">(?)</span>
         <% end %>:
       </td>
-      <td><input type="text" name="<%= key %>" value="<%= value['default'] || value[:default] %>"></td>
+      <td><input type="text" name="<%= h key %>" value="<%= h(value['default'] || value[:default]) %>"></td>
   <% end %>
   </table>
-  <input type="hidden" name="job_name" value="<%= @job_name %>">
+  <input type="hidden" name="job_name" value="<%= h @job_name %>">
   <input type="submit" value="Queue now">
 </form>

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

@@ -4,8 +4,8 @@
   The list below contains all scheduled jobs.  Click "Queue now" to queue
   a job immediately.
   <br/> Server local time: <%= Time.now %>
-  <br/> Server Environment: <%= Resque::Scheduler.env %>
-  <br/> Current master: <%= Resque.redis.get(Resque::Scheduler.master_lock.key) %>
+  <br/> Server Environment: <%= h Resque::Scheduler.env %>
+  <br/> Current master: <%= h Resque.redis.get(Resque::Scheduler.master_lock.key) %>
 </p>
 <p class='intro'>
   The highlighted jobs are skipped for current environment.

data/lib/resque/scheduler/server/views/search.erb

@@ -22,13 +22,13 @@
         <td style="padding-top: 12px; padding-bottom: 2px; width: 10px">
           <form action="<%= u "/delayed/cancel_now" %>" method="post">
             <input type="hidden" name="timestamp" value="<%= job['timestamp'].to_i %>">
-            <input type="hidden" name="klass" value="<%= job['class'] %>">
+            <input type="hidden" name="klass" value="<%= h job['class'] %>">
             <input type="hidden" name="args" value="<%= h(Resque.encode job['args']) %>">
             <input type="submit" value="Cancel Job">
           </form>
         </td>
         <td class='args'><%= format_time(Time.at(job['timestamp'])) %></td>
-        <td class='class'><%= job['class'] %></td>
+        <td class='class'><%= h job['class'] %></td>
         <td class='args'><%= h job['args'].inspect %></td>
       </tr>
   <% end %>
@@ -44,8 +44,8 @@
   </tr>
   <% queued.each do |job| %>
   <tr>
-    <td class='class'><%= job['queue'] %></td>
-    <td class='class'><%= job['class'] %></td>
+    <td class='class'><%= h job['queue'] %></td>
+    <td class='class'><%= h job['class'] %></td>
     <td class='args'><%= h job['args'].inspect %></td>
   </tr>
   <% end %>
@@ -61,8 +61,8 @@
   </tr>
   <% working.each do |job| %>
   <tr>
-    <td class='class'><%= job['queue'] %></td>
-    <td class='class'><%= job['class'] %></td>
+    <td class='class'><%= h job['queue'] %></td>
+    <td class='class'><%= h job['class'] %></td>
     <td class='args'><%= h job['args'].inspect %></td>
   </tr>
   <% end %>

data/lib/resque/scheduler/version.rb

@@ -2,6 +2,6 @@
 
 module Resque
   module Scheduler
-    VERSION = '5.0.0'.freeze
+    VERSION = '5.0.1'.freeze
   end
 end

data/lib/resque/scheduler.rb

@@ -1,6 +1,6 @@
 # vim:fileencoding=utf-8
 
-require 'redis/errors'
+require 'redis'
 require 'rufus/scheduler'
 require_relative 'scheduler/configuration'
 require_relative 'scheduler/locking'
@@ -49,6 +49,7 @@ module Resque
         $stderr.sync = true
 
         was_master = nil
+        schedule_loaded = false
 
         begin
           @th = Thread.current
@@ -61,8 +62,14 @@ module Resque
               if am_master != was_master
                 procline am_master ? 'Master scheduler' : 'Child scheduler'
 
-                # Load schedule because changed
-                reload_schedule!
+                # The first pass always loads the schedule - load_schedule!
+                # reads am_master, so it cannot run before the check above.
+                # After that, only a dynamic schedule can have changed while
+                # we were not master.
+                if dynamic || !schedule_loaded
+                  reload_schedule!
+                  schedule_loaded = true
+                end
               end
 
               if am_master
@@ -148,8 +155,13 @@ module Resque
             args = optionizate_interval_value(config[interval_type])
             args = [args, nil, job: true] if args.is_a?(::String)
 
-            job = rufus_scheduler.send(interval_type, *args) do
-              enqueue_recurring(name, config)
+            begin
+              job = rufus_scheduler.send(interval_type, *args) do
+                enqueue_recurring(name, config)
+              end
+            rescue ArgumentError => e
+              log_error "Invalid #{interval_type} schedule for #{name}: #{e.message} - skipping"
+              return
             end
             @scheduled_jobs[name] = job
             interval_defined = true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: resque-scheduler
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.0.1
 platform: ruby
 authors:
 - Ben VandenBos
@@ -10,10 +10,9 @@ authors:
 - Dan Buch
 - Michael Bianco
 - Patrick Tulskie
-autorequire: 
 bindir: exe
 cert_chain: []
-date: 2026-01-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -322,7 +321,6 @@ files:
 - ".devcontainer/devcontainer.json"
 - ".devcontainer/docker-compose.yml"
 - ".github/dependabot.yml"
-- ".github/funding.yml"
 - ".github/workflows/codeql-analysis.yml"
 - ".github/workflows/rubocop.yml"
 - ".github/workflows/ruby.yml"
@@ -369,7 +367,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -384,8 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 4.0.16
 specification_version: 4
 summary: Light weight job scheduling on top of Resque
 test_files: []

data/.github/funding.yml

@@ -1,4 +0,0 @@
-# Docs for this file can be found here:
-# https://docs.github.com/en/github/administering-a-repository/displaying-a-sponsor-button-in-your-repository
-
-github: ["iloveitaly"]