sidekiq-scheduler 2.1.6 → 2.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c985cef8663dd93691d7126e7f3d171a90468ed1
-  data.tar.gz: 14a52c0d0893dec74583c469a7add3642b7bd4ec
+  metadata.gz: 9f9d5095b0da933e653ac5a47bc0a0a0057ad48b
+  data.tar.gz: 9daee302488e577371f041188e7d0f84d9833913
 SHA512:
-  metadata.gz: 137fbd73b53008346c7ece03eea9fb64c14790e13b0b1f824dbcb48b929fce42353ed1fdb98921c331b63c11890a10469b637a8b1f7e841f21c518730f946272
-  data.tar.gz: 7ce02d5cd4ad8936c3f6203204aacf9756654ec8f4427caa849661bb9cc4962b765cddbefb1cae9507e94e64dc5c29ecda7294b623fe78e88a2f7404bbed00fc
+  metadata.gz: d356b101fd6427b204c46317604e2791135810173480b8ddfe4edb6c991008c9369b260dc576a7500ef33b8475ddbde41dab8d0bf281ccece6925e7aa75259a6
+  data.tar.gz: c6023a20103f5fdf9744e82435b2a68a6c2ec0407225602623886ede7297883a73e0523a4f664de5125ddc32318384122e2cf568eab5c5f7f46d0f6073cfb20d

data/lib/sidekiq-scheduler/schedule.rb

@@ -53,8 +53,6 @@ module SidekiqScheduler
     end
 
     def schedule
-      reload_schedule! unless @schedule
-
       @schedule
     end
 
@@ -106,7 +104,7 @@ module SidekiqScheduler
       existing_config = get_schedule(name)
       unless existing_config && existing_config == config
         Sidekiq.redis { |r| r.hset(:schedules, name, JSON.generate(config)) }
-        Sidekiq.redis { |r| r.sadd(:schedules_changed, name) }
+        Sidekiq.redis { |r| r.zadd(:schedules_changed, Time.now.to_f, name) }
       end
       config
     end
@@ -114,7 +112,7 @@ module SidekiqScheduler
     # remove a given schedule by name
     def remove_schedule(name)
       Sidekiq.redis { |r| r.hdel(:schedules, name) }
-      Sidekiq.redis { |r| r.sadd(:schedules_changed, name) }
+      Sidekiq.redis { |r| r.zadd(:schedules_changed, Time.now.to_f, name) }
     end
 
     private

data/lib/sidekiq-scheduler/version.rb

@@ -1,5 +1,5 @@
 module SidekiqScheduler
 
-  VERSION = '2.1.6'
+  VERSION = '2.1.7'
 
 end

data/lib/sidekiq-scheduler/web.rb

@@ -22,6 +22,8 @@ module SidekiqScheduler
       end
 
       app.get '/recurring-jobs/:name/toggle' do
+        Sidekiq.reload_schedule!
+
         Sidekiq::Scheduler.toggle_job_enabled(params[:name])
         redirect "#{root_path}recurring-jobs"
       end

data/lib/sidekiq/scheduler.rb

@@ -54,6 +54,7 @@ module Sidekiq
           # Load schedule from redis for the first time if dynamic
           if dynamic
             Sidekiq.reload_schedule!
+            @current_changed_score = Time.now.to_f
             rufus_scheduler.every('5s') do
               update_schedule
             end
@@ -73,7 +74,7 @@ module Sidekiq
             end
           end
 
-          Sidekiq.redis { |r| r.del(:schedules_changed) }
+          Sidekiq.redis { |r| r.del(:schedules_changed) unless r.type(:schedules_changed) == 'zset' }
 
           logger.info 'Schedules Loaded'
         else
@@ -207,10 +208,15 @@ module Sidekiq
       end
 
       def update_schedule
-        if Sidekiq.redis { |r| r.scard(:schedules_changed) } > 0
+        last_changed_score, @current_changed_score = @current_changed_score, Time.now.to_f
+        schedule_changes = Sidekiq.redis do |r|
+          r.zrangebyscore :schedules_changed, last_changed_score, "(#{@current_changed_score}"
+        end
+
+        if schedule_changes.size > 0
           logger.info 'Updating schedule'
           Sidekiq.reload_schedule!
-          while schedule_name = Sidekiq.redis { |r| r.spop(:schedules_changed) }
+          schedule_changes.each do |schedule_name|
             if Sidekiq.schedule.keys.include?(schedule_name)
               unschedule_job(schedule_name)
               load_schedule_job(schedule_name, Sidekiq.schedule[schedule_name])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.1.6
+  version: 2.1.7
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-23 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq