sidekiq-scheduler 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aff61224563645891063110d5f9ae5d16e6ccb0fee92df6a5f26976d0169c01b
-  data.tar.gz: d8a6ac2c6e17426bc095904ac3721a9433a21cfd1be433e5f280b9af5469954a
+  metadata.gz: b8bddb1a9c6aeffceb3a1efde76cc88285a5a4ef2ea1e7e1ef85ac35b4e311f4
+  data.tar.gz: b88000d6771e9a5d88754dd753bf96dc142453ff170bf2fd11bbe1afc50de3fd
 SHA512:
-  metadata.gz: b01ea69bb3bafd959681e3f7cb3a5699385bdf73bf8abeb8e75a6e2765ec1476862f1d499046ae00233539ec266d313c55c03558961fab8f02b048e4164778bd
-  data.tar.gz: 7662c439f79b05f2954cfc0e1da2d0a84236334f75101431ed187ae8c69df47baa52cbee901e90a84e81b7ed5b7f81198938ca09cf3710f5885866b334cfcb43
+  metadata.gz: 444aa2319dfe4a4817348ed7cd8d92d3f11ca16ed04ac9b8c4b590c68d2c86ef7df27cab0a81d0c78c0a26000cdaaa332870d0ec644a59241d96c34ddc80b5e0
+  data.tar.gz: 32ecf78f608fbec6a2b017a88d1bd332f4af20931d55751ea44499af77a2df664ff71a57a3bce55dac2c8ded981fc960b96b67eb3076f7ab7c7d3b59baa77fc5

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

@@ -161,7 +161,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 +307,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,5 @@
 module SidekiqScheduler
 
-  VERSION = '3.1.1'
+  VERSION = '3.2.0'
 
 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

@@ -5,7 +5,7 @@
 <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.0
 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-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq