sidekiq-scheduler 3.1.1 → 3.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aff61224563645891063110d5f9ae5d16e6ccb0fee92df6a5f26976d0169c01b
-  data.tar.gz: d8a6ac2c6e17426bc095904ac3721a9433a21cfd1be433e5f280b9af5469954a
+  metadata.gz: b7d47069eda4c979115cb594aa870a55546a7fe1b895053fb2df69b0962163eb
+  data.tar.gz: e966ab0f5aa48ec3fef2adfe4327e8b72b38f1c4f8da593052e9227e3396b69c
 SHA512:
-  metadata.gz: b01ea69bb3bafd959681e3f7cb3a5699385bdf73bf8abeb8e75a6e2765ec1476862f1d499046ae00233539ec266d313c55c03558961fab8f02b048e4164778bd
-  data.tar.gz: 7662c439f79b05f2954cfc0e1da2d0a84236334f75101431ed187ae8c69df47baa52cbee901e90a84e81b7ed5b7f81198938ca09cf3710f5885866b334cfcb43
+  metadata.gz: f45636415dac48c0882d75449475d10de07beb6d1f1bfe2873d71f0264f65f2cb58a7a5dd42ff5bd784d79f46f2bd4f00ceb2d27bae47fcc80796b5dbcd22be8
+  data.tar.gz: e338d8ff6767dbe7ea21a22fd23d702d49b7095a64be296843d97dcaa415b9c73867edd0601dd4839ccce91bdf271aabaa458d9954b6cb2e42273dd460428383

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# 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

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

@@ -5,7 +5,10 @@ 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")
-Sidekiq::Web.use Rack::Static, urls: ['/stylesheets'],
-                               root: ASSETS_PATH,
-                               cascade: true,
-                               header_rules: [[:all, { 'Cache-Control' => 'public, max-age=86400' }]]
+
+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

data/lib/sidekiq-scheduler/manager.rb

@@ -1,7 +1,5 @@
 require 'redis'
 
-require 'sidekiq/util'
-
 require 'sidekiq-scheduler/schedule'
 require 'sidekiq-scheduler/scheduler'
 
@@ -12,8 +10,6 @@ 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

@@ -137,9 +137,9 @@ module SidekiqScheduler
     def self.register_job_instance(job_name, time)
       job_key = pushed_job_key(job_name)
       registered, _ = Sidekiq.redis do |r|
-        r.pipelined do
-          r.zadd(job_key, time.to_i, time.to_i)
-          r.expire(job_key, REGISTERED_JOBS_THRESHOLD_IN_SECONDS)
+        r.pipelined do |pipeline|
+          pipeline.zadd(job_key, time.to_i, time.to_i)
+          pipeline.expire(job_key, REGISTERED_JOBS_THRESHOLD_IN_SECONDS)
         end
       end
 

data/lib/sidekiq-scheduler/schedule.rb

@@ -140,7 +140,9 @@ module SidekiqScheduler
     def infer_queue(klass)
       klass = try_to_constantize(klass)
 
-      if klass.respond_to?(:sidekiq_options)
+      # ActiveJob uses queue_as when the job is created
+      # to determine the queue
+      if klass.respond_to?(:sidekiq_options) && !SidekiqScheduler::Utils.active_job_enqueue?(klass)
         klass.sidekiq_options['queue']
       end
     end

data/lib/sidekiq-scheduler/scheduler.rb

@@ -1,14 +1,11 @@
 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
@@ -161,7 +158,7 @@ module SidekiqScheduler
         config['args'] = arguments_with_metadata(config['args'], scheduled_at: time.to_f)
       end
 
-      if active_job_enqueue?(config['class'])
+      if SidekiqScheduler::Utils.active_job_enqueue?(config['class'])
         SidekiqScheduler::Utils.enqueue_with_active_job(config)
       else
         SidekiqScheduler::Utils.enqueue_with_sidekiq(config)
@@ -307,17 +304,6 @@ module SidekiqScheduler
       queues.empty? || queues.include?(job_queue)
     end
 
-    # Returns true if the enqueuing needs to be done for an ActiveJob
-    #  class false otherwise.
-    #
-    # @param [Class] klass the class to check is decendant from ActiveJob
-    #
-    # @return [Boolean]
-    def active_job_enqueue?(klass)
-      klass.is_a?(Class) && defined?(ActiveJob::Enqueuing) &&
-        klass.included_modules.include?(ActiveJob::Enqueuing)
-    end
-
     # Convert the given arguments in the format expected to be enqueued.
     #
     # @param [Hash] config the options to be converted

data/lib/sidekiq-scheduler/utils.rb

@@ -68,6 +68,17 @@ module SidekiqScheduler
       end
     end
 
+    # Returns true if the enqueuing needs to be done for an ActiveJob
+    #  class false otherwise.
+    #
+    # @param [Class] klass the class to check is decendant from ActiveJob
+    #
+    # @return [Boolean]
+    def self.active_job_enqueue?(klass)
+      klass.is_a?(Class) && defined?(ActiveJob::Enqueuing) &&
+        klass.included_modules.include?(ActiveJob::Enqueuing)
+    end
+
     # Enqueues the job using the Sidekiq client.
     #
     # @param [Hash] config The job configuration

data/lib/sidekiq-scheduler/version.rb

@@ -1,5 +1,3 @@
 module SidekiqScheduler
-
-  VERSION = '3.1.1'
-
+  VERSION = '3.2.2'
 end

data/web/assets/stylesheets/recurring_jobs.css

@@ -14,6 +14,10 @@
   border: 1px solid rgba(0, 0, 0, 0.1);
 }
 
+.list-group-item-disabled {
+  background-color: #f3d3d3;
+}
+
 @media (prefers-color-scheme: dark) {
   .list-group-item {
     background-color: #222;

data/web/views/recurring_jobs.erb

@@ -1,11 +1,35 @@
-<link href="<%= root_path %>stylesheets/recurring_jobs.css" media="screen" rel="stylesheet" type="text/css" />
+<% 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 %>
 
 <h3><%= t('recurring_jobs') %></h3>
 
 <div class="recurring-jobs">
   <ul class="list-group">
     <% @presented_jobs.each do |job| %>
-      <li class="list-group-item">
+      <li class="list-group-item <%= !job.enabled? && "list-group-item-disabled" %>">
         <div class="title">
           <div class="row">
             <div class="col-xs-6">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.2
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
@@ -263,6 +263,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
 - MIT-LICENSE
 - README.md
 - Rakefile