sidekiq-scheduler 2.0.19 → 2.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cd4d7812270a42a1fba60eb58d6bb15e64cea545
-  data.tar.gz: f19980d703c2914483df61357fc3edd7d5fb4887
+  metadata.gz: b0729c34d520add53c677fd20e22ee3a29ee1e29
+  data.tar.gz: b437226e4b3c9214cca3e595c4e891e45de5672c
 SHA512:
-  metadata.gz: 628c7aa26722c33a2744b3239412a307a59d9de62ac5182144eec62098942b5c31b902d24c22089b5bc6c8f5da8141ede0fbc29c42cc72f3f00301d329f929ea
-  data.tar.gz: dc1e2a7c303f10fee40dadb5fa7cdb3ad6b8c6e4c437c478ec1beb65c1f32bf2cb88955b7c7e1c625a5d4a628915d84b71795fe4318585904e4e5ca62fdbabea
+  metadata.gz: 389f35144c0135f392266d6fd68fc8144fe06599475cd956ad1c70e4fa3c29eb0fa8c7f0609373e55ba6e610f6f616366d15164e171785e92b2ea0dd25b52cff
+  data.tar.gz: 021b55299dff4d7b00a6a3cf1a34acf52d44ceaa92d79ad3ccf3321b11534c2acfcf646887a08caeda317029bb03fcbe47430a178504aaaa048ded7830483caf

data/README.md

@@ -145,6 +145,16 @@ seconds past the minute).
 A big shout out to [rufus-scheduler](http://github.com/jmettraux/rufus-scheduler)
 for handling the heavy lifting of the actual scheduling engine.
 
+NOTE: As schedules are persisted in Redis, an empty schedule will purge any schedule previously stored.
+sidekiq-scheduler instances running with `dynamic` flag set to `true` and empty schedule configuration will not push any job.
+Before version 2.0.8, instances matching those conditions read the previously stored schedule and push the jobs to sidekiq as usual.
+
+With version >= `2.0.8` the purge of Redis schedules config can be prevented by setting
+`enabled` flag to `false`:
+
+```yaml
+:enabled: false
+```
 ### Enabling/Disabling jobs
 
 By default all the jobs are enabled. There is an option at job's configuration to change

data/lib/sidekiq-scheduler.rb

@@ -18,10 +18,13 @@ Sidekiq.configure_server do |config|
     listened_queues_only = Sidekiq::Scheduler.listened_queues_only
     listened_queues_only = listened_queues_only.nil? ? scheduler[:listened_queues_only] : listened_queues_only
 
+    schedule = Sidekiq.schedule
+    schedule ||= config.options[:schedule] || {}
+
     scheduler_options = {
       dynamic:   dynamic,
       enabled:   enabled,
-      schedule:  config.options.fetch(:schedule, nil),
+      schedule:  schedule,
       listened_queues_only: listened_queues_only
     }
 

data/lib/sidekiq-scheduler/job_presenter.rb

@@ -54,7 +54,9 @@ module SidekiqScheduler
     # @param schedule_hash [Hash] with the redis schedule
     # @return [Array<JobPresenter>] an array with the instances of presenters
     def self.build_collection(schedule_hash)
-      Hash(schedule_hash).map do |name, job_spec|
+      schedule_hash ||= {}
+
+      schedule_hash.map do |name, job_spec|
         new(name, job_spec)
       end
     end

data/lib/sidekiq-scheduler/manager.rb

@@ -18,7 +18,7 @@ module SidekiqScheduler
       Sidekiq::Scheduler.enabled = options[:enabled]
       Sidekiq::Scheduler.dynamic = options[:dynamic]
       Sidekiq::Scheduler.listened_queues_only = options[:listened_queues_only]
-      Sidekiq.schedule = options[:schedule] || {}
+      Sidekiq.schedule = options[:schedule]
     end
 
     def stop

data/lib/sidekiq-scheduler/schedule.rb

@@ -38,7 +38,7 @@ module SidekiqScheduler
     # param, otherwise params is passed in as the only parameter to perform.
     def schedule=(schedule_hash)
       schedule_hash = prepare_schedule(schedule_hash)
-      to_remove = (get_all_schedules || {}).keys - schedule_hash.keys.map(&:to_s)
+      to_remove = get_all_schedules.keys - schedule_hash.keys.map(&:to_s)
 
       schedule_hash.each do |name, job_spec|
         set_schedule(name, job_spec)
@@ -52,7 +52,7 @@ module SidekiqScheduler
     end
 
     def schedule
-      @schedule ||= {}
+      @schedule
     end
 
     # Reloads the schedule from Redis and return it.
@@ -77,10 +77,9 @@ module SidekiqScheduler
 
     # gets the schedule as it exists in redis
     def get_all_schedules
-      schedules = nil
-      if Sidekiq.redis { |r| r.exists(:schedules) }
-        schedules = {}
+      schedules = {}
 
+      if Sidekiq.redis { |r| r.exists(:schedules) }
         Sidekiq.redis { |r| r.hgetall(:schedules) }.tap do |h|
           h.each do |name, config|
             schedules[name] = JSON(config)

data/lib/sidekiq-scheduler/version.rb

@@ -1,5 +1,5 @@
 module SidekiqScheduler
 
-  VERSION = '2.0.19'
+  VERSION = '2.0.20'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 2.0.19
+  version: 2.0.20
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-14 00:00:00.000000000 Z
+date: 2016-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie