sidekiq-scheduler 3.2.2 → 4.0.0.alpha1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7d47069eda4c979115cb594aa870a55546a7fe1b895053fb2df69b0962163eb
-  data.tar.gz: e966ab0f5aa48ec3fef2adfe4327e8b72b38f1c4f8da593052e9227e3396b69c
+  metadata.gz: 2a45a1821398ad12b4ebc760efb1ac6aec3c62d38a1176f2a9c804a2dbf08fab
+  data.tar.gz: 5a9a8cb6e9c7a8262829c9f53a5aacb7ae91e5ae411627da1c189a471b803e12
 SHA512:
-  metadata.gz: f45636415dac48c0882d75449475d10de07beb6d1f1bfe2873d71f0264f65f2cb58a7a5dd42ff5bd784d79f46f2bd4f00ceb2d27bae47fcc80796b5dbcd22be8
-  data.tar.gz: e338d8ff6767dbe7ea21a22fd23d702d49b7095a64be296843d97dcaa415b9c73867edd0601dd4839ccce91bdf271aabaa458d9954b6cb2e42273dd460428383
+  metadata.gz: 9772349882c5194d63775696468722b637dd1ec6c420027ef25107a0821c073e6440fa797d41432e4b93c1da9964f03a3032eb3853b57fa23525a08ba606b68d
+  data.tar.gz: 4d424d7826176deb095cfa9450392eb3aa0b8630ee446a7dc0daf917e4ddd6c77c2bc8f7259bcb2450554bbdc77ecf3772dfbdd4f757eff1be7c7661c9bab392

data/README.md

@@ -30,7 +30,7 @@
 `sidekiq-scheduler` is an extension to [Sidekiq](http://github.com/mperham/sidekiq) that
 pushes jobs in a scheduled way, mimicking cron utility.
 
-__Note:__ If you are looking for version 2.2.*, go to [2.2-stable branch](https://github.com/moove-it/sidekiq-scheduler/tree/2.2-stable).
+__Note:__ Current branch contains work for a V4 release, if you are looking for version 2.2.* or 3.*, go to [2.2-stable branch](https://github.com/moove-it/sidekiq-scheduler/tree/2.2-stable) / [v3-stable](https://github.com/moove-it/sidekiq-scheduler/tree/v3-stable).
 
 ## Installation
 
@@ -100,6 +100,7 @@ Available options are:
 :enabled: <enables scheduler if true [true by default]>
 :scheduler:
   :listened_queues_only: <push jobs whose queue is being listened by sidekiq [false by default]>
+:rufus_scheduler_options: <Set custom options for rufus scheduler, like max_work_threads [{} by default]>
 ```
 
 ## Schedule configuration
@@ -304,10 +305,16 @@ If you're configuring your own Redis connection pool, you need to make sure the
 
 That's a minimum of `concurrency` + 5 (per the [Sidekiq wiki](https://github.com/mperham/sidekiq/wiki/Using-Redis#complete-control)) + `Rufus::Scheduler::MAX_WORK_THREADS` (28 as of this writing; per the [Rufus README](https://github.com/jmettraux/rufus-scheduler#max_work_threads)), for a total of 58 with the default `concurrency` of 25.
 
-You can also override the thread pool size in Rufus Scheduler by setting e.g.:
+You can also override the thread pool size in Rufus Scheduler by setting the following in your `sidekiq.yml` config:
 
-```
-SidekiqScheduler::Scheduler.instance.rufus_scheduler_options = { max_work_threads: 5 }
+```yaml
+---
+...
+
+rufus_scheduler_options:
+  max_work_threads: 5
+
+...
 ```
 
 ## Notes about running on Multiple Hosts
@@ -321,7 +328,7 @@ Non-normal conditions that could push a specific job multiple times are:
 
 `every`, `interval` and `in` jobs will be pushed once per host.
 
-## Notes on when sidekiq worker is down
+## Notes on when Sidekiq worker is down
 
 For a `cron`/`at` (and all other) job to be successfully enqueued, you need at least one sidekiq worker with scheduler to be up at that moment. Handling this is up to you and depends on your application.
 
@@ -334,6 +341,54 @@ Possible solutions include:
 
 Each option has it's own pros and cons. 
 
+## Notes when running multiple Sidekiq processors on the same Redis
+
+### TL;DR
+
+Be **sure** to include the `:enabled: false` top-level key on any additional
+configurations to avoid any possibility of the `schedules` definition being
+wiped by the second Sidekiq process.
+
+To illustrate what we mean:
+
+Say you have one process with the schedule:
+```yaml
+# e.g., config/sidekiq.yml
+
+:queues:
+  - default
+:schedule:
+  do_something_every_minute:
+    class: DoSomethingJob
+    args: matey
+    queue: :scheduler
+    cron: '0 * * * * * America/Los_Angeles'
+```
+
+And a separate separate configured process without one:
+```yaml
+# e.g., config/sidekiq_other.yml
+:queues:
+  - scheduler
+
+## NOTE Disable the Scheduler
+:enabled: false
+```
+
+### Details
+
+This gem stores the configured schedule in Redis on boot. It's used, primarily,
+to display in the Web Integration, and allow you to interact with that schedule
+via that integration.
+
+If you're running multiple Sidekiq processes on the same Redis namespace with
+different configurations, **you'll want to explicitly _disable_ Sidekiq
+Scheduler** for the other processes not responsible for the schedule. If you
+don't, the last booted Sidekiq processes' schedule will be what is stored in
+Redis.
+
+See https://github.com/moove-it/sidekiq-scheduler/issues/361 for a more details.
+
 ## Sidekiq Web Integration
 
 sidekiq-scheduler provides an extension to the Sidekiq web interface that adds a `Recurring Jobs` page.
@@ -408,6 +463,7 @@ MIT License
 
 ## Copyright
 
-Copyright 2013 - 2018 Moove-IT.
-Copyright 2012 Morton Jonuschat.
-Some parts copyright 2010 Ben VandenBos.
+- Copyright 2021 - 2022 Marcelo Lauxen.
+- Copyright 2013 - 2022 Moove-IT.
+- Copyright 2012 Morton Jonuschat.
+- Some parts copyright 2010 Ben VandenBos.

data/lib/sidekiq-scheduler/extensions/web.rb

@@ -5,10 +5,7 @@ ASSETS_PATH = File.expand_path('../../../web/assets', __dir__)
 Sidekiq::Web.register(SidekiqScheduler::Web)
 Sidekiq::Web.tabs['recurring_jobs'] = 'recurring-jobs'
 Sidekiq::Web.locales << File.expand_path("#{File.dirname(__FILE__)}/../../../web/locales")
-
-if Sidekiq::VERSION >= '6.0.0'
-  Sidekiq::Web.use Rack::Static, urls: ['/stylesheets'],
-                                 root: ASSETS_PATH,
-                                 cascade: true,
-                                 header_rules: [[:all, { 'Cache-Control' => 'public, max-age=86400' }]]
-end
+Sidekiq::Web.use Rack::Static, urls: ['/stylesheets'],
+                               root: ASSETS_PATH,
+                               cascade: true,
+                               header_rules: [[:all, { 'Cache-Control' => 'public, max-age=86400' }]]

data/lib/sidekiq-scheduler/manager.rb

@@ -1,5 +1,7 @@
 require 'redis'
 
+require 'sidekiq/util'
+
 require 'sidekiq-scheduler/schedule'
 require 'sidekiq-scheduler/scheduler'
 
@@ -10,6 +12,8 @@ module SidekiqScheduler
   # from Redis onto the work queues
   #
   class Manager
+    include Sidekiq::Util
+
     DEFAULT_SCHEDULER_OPTIONS = {
       enabled: true,
       dynamic: false,

data/lib/sidekiq-scheduler/redis_manager.rb

@@ -9,7 +9,7 @@ module SidekiqScheduler
     #
     # @return [String] schedule in JSON format
     def self.get_job_schedule(name)
-      hget(:schedules, name)
+      hget('schedules', name)
     end
 
     # Returns the state of a given job
@@ -44,7 +44,7 @@ module SidekiqScheduler
     # @param [String] name The name of the job
     # @param [Hash] config The new schedule for the job
     def self.set_job_schedule(name, config)
-      hset(:schedules, name, JSON.generate(config))
+      hset('schedules', name, JSON.generate(config))
     end
 
     # Sets the state for a given job
@@ -75,7 +75,7 @@ module SidekiqScheduler
     #
     # @param [String] name The name of the job
     def self.remove_job_schedule(name)
-      hdel(:schedules, name)
+      hdel('schedules', name)
     end
 
     # Removes the next execution time for a given job
@@ -89,21 +89,14 @@ module SidekiqScheduler
     #
     # @return [Hash] hash with all the job schedules
     def self.get_all_schedules
-      Sidekiq.redis { |r| r.hgetall(:schedules) }
+      Sidekiq.redis { |r| r.hgetall('schedules') }
     end
 
     # Returns boolean value that indicates if the schedules value exists
     #
     # @return [Boolean] true if the schedules key is set, false otherwise
     def self.schedule_exist?
-      Sidekiq.redis do |r|
-        case r.exists(:schedules)
-        when true, 1
-          true
-        else
-          false
-        end
-      end
+      Sidekiq.redis { |r| r.exists?('schedules') }
     end
 
     # Returns all the schedule changes for a given time range.
@@ -113,19 +106,19 @@ module SidekiqScheduler
     #
     # @return [Array] array with all the changed job names
     def self.get_schedule_changes(from, to)
-      Sidekiq.redis { |r| r.zrangebyscore(:schedules_changed, from, "(#{to}") }
+      Sidekiq.redis { |r| r.zrangebyscore('schedules_changed', from, "(#{to}") }
     end
 
     # Register a schedule change for a given job
     #
     # @param [String] name The name of the job
     def self.add_schedule_change(name)
-      Sidekiq.redis { |r| r.zadd(:schedules_changed, Time.now.to_f, name) }
+      Sidekiq.redis { |r| r.zadd('schedules_changed', Time.now.to_f, name) }
     end
 
     # Remove all the schedule changes records
     def self.clean_schedules_changed
-      Sidekiq.redis { |r| r.del(:schedules_changed) unless r.type(:schedules_changed) == 'zset' }
+      Sidekiq.redis { |r| r.del('schedules_changed') unless r.type('schedules_changed') == 'zset' }
     end
 
     # Removes a queued job instance
@@ -188,7 +181,7 @@ module SidekiqScheduler
     end
 
     private
-
+    
     # Returns the value of a Redis stored hash field
     #
     # @param [String] hash_key The key name of the hash

data/lib/sidekiq-scheduler/scheduler.rb

@@ -1,11 +1,13 @@
 require 'rufus/scheduler'
-require 'thwait'
+require 'sidekiq/util'
 require 'json'
 require 'sidekiq-scheduler/rufus_utils'
 require 'sidekiq-scheduler/redis_manager'
 
 module SidekiqScheduler
   class Scheduler
+    extend Sidekiq::Util
+
     # We expect rufus jobs to have #params
     Rufus::Scheduler::Job.module_eval do
       alias_method :params, :opts
@@ -23,6 +25,9 @@ module SidekiqScheduler
     # Set to schedule jobs only when will be pushed to queues listened by sidekiq
     attr_accessor :listened_queues_only
 
+    # Set custom options for rufus scheduler, like max_work_threads.
+    attr_accessor :rufus_scheduler_options
+
     class << self
 
       def instance
@@ -44,6 +49,7 @@ module SidekiqScheduler
       self.dynamic = options[:dynamic]
       self.dynamic_every = options[:dynamic_every]
       self.listened_queues_only = options[:listened_queues_only]
+      self.rufus_scheduler_options = options[:rufus_scheduler_options] || {}
     end
 
     # the Rufus::Scheduler jobs that are scheduled
@@ -165,14 +171,6 @@ module SidekiqScheduler
       end
     end
 
-    def rufus_scheduler_options
-      @rufus_scheduler_options ||= {}
-    end
-
-    def rufus_scheduler_options=(options)
-      @rufus_scheduler_options = options
-    end
-
     def rufus_scheduler
       @rufus_scheduler ||= SidekiqScheduler::Utils.new_rufus_scheduler(rufus_scheduler_options)
     end

data/lib/sidekiq-scheduler/version.rb

@@ -1,3 +1,3 @@
 module SidekiqScheduler
-  VERSION = '3.2.2'
+  VERSION = "4.0.0.alpha1"
 end

data/web/views/recurring_jobs.erb

@@ -1,28 +1,4 @@
-<% if Sidekiq::VERSION >= '6.0.0' %>
-  <link href="<%= root_path %>stylesheets/recurring_jobs.css" media="screen" rel="stylesheet" type="text/css" />
-<% else %>
-  <style>
-    .recurring-jobs { border-top-left-radius: 4px; border-top-right-radius: 4px; }
-    .recurring-jobs .title { margin-bottom: 5px; }
-    .recurring-jobs .title .name { font-weight: bold;}
-    .recurring-jobs .info,
-    .recurring-jobs .description { margin-bottom: 5px; }
-    .recurring-jobs .actions { margin-bottom: 5px; }
-    .recurring-jobs .status,
-    .recurring-jobs .description { font-size: 12px; }
-    .recurring-jobs .enqueue { margin-bottom: 0.5rem }
-
-    .list-group-item {
-      background-color: #f3f3f3;
-      color: #585454;
-      border: 1px solid rgba(0, 0, 0, 0.1);
-    }
-
-    .list-group-item-disabled {
-      background-color: #f3d3d3;
-    }
-  </style>
-<% end %>
+<link href="<%= root_path %>stylesheets/recurring_jobs.css" media="screen" rel="stylesheet" type="text/css" />
 
 <h3><%= t('recurring_jobs') %></h3>
 

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.2.2
+  version: 4.0.0.alpha1
 platform: ruby
 authors:
 - Morton Jonuschat
 - Moove-it
+- Marcelo Lauxen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -31,20 +32,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '5'
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
   requirement: !ruby/object:Gem::Requirement
@@ -73,34 +68,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.0
-- !ruby/object:Gem::Dependency
-  name: thwait
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: e2mmap
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -119,28 +86,28 @@ dependencies:
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -163,30 +130,16 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.28.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.28.0
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -200,7 +153,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activejob
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -214,7 +167,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: coveralls
+  name: activejob
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -259,11 +212,11 @@ description: Light weight job scheduling extension for Sidekiq that adds support
   queueing jobs in a recurring way.
 email:
 - sidekiq-scheduler@moove-it.com
+- marcelolauxen16@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- CHANGELOG.md
 - MIT-LICENSE
 - README.md
 - Rakefile
@@ -307,12 +260,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.19
 signing_key: 

data/CHANGELOG.md

@@ -1,11 +0,0 @@
-# 3.2.2
-
-- [FIX] Add support for sidekiq 6.5 #382
-
-# 3.2.1
-  - Fix CSS not loading on Rails app when Sidekiq < 6 https://github.com/moove-it/sidekiq-scheduler/pull/377
-# 3.2.0
-
-- Fix deprecated uses of Redis#pipelined https://github.com/moove-it/sidekiq-scheduler/pull/357
-- Prevent sidekiq_options from overriding ActiveJob queue settings https://github.com/moove-it/sidekiq-scheduler/pull/367
-- Highlight disabled jobs https://github.com/moove-it/sidekiq-scheduler/pull/369