sidekiq-scheduler 1.2.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 913d0a502c80f79cdca4bc85a596045107d8f832
-  data.tar.gz: 29b8f1d878f48f8ac2c76247f5bfe32c8f81d4c9
+  metadata.gz: 037b6a4d410e4524dbf981cc073d9c30c5e31009
+  data.tar.gz: 345305609e9b89c755d636c6c9124090be88c777
 SHA512:
-  metadata.gz: 1facd7ab31fad6ef51c970ec935c14dda672844bf4ef47443750e1f0892e04cb0fd35e7a491468d836f121f49e18ef033f07e5dee32f41e111a216040d36de09
-  data.tar.gz: 74fd5650d26acfd341ad425cb3ba95eee3cc5001d2c9d852d91c6ee6a318806250c206ec9fd55046390a04977643b30960fe295f9617bcbc69332a64832e5518
+  metadata.gz: f4581a66f03bd8c574565f3ea432fc5a179a1a3e28fd3d93c0822f320b36369415c2cb84945599772631b9b4c4828f3f4f8b011144c7ecf516cb4546020066b1
+  data.tar.gz: 582260da864b28b3f9cf0484012e1356dad92253732f1c404cf2b3fb2971563ed8bc87b9d728848e5e6f80a3fa18e50c8e1a67c87d75cb627f4864f050ca46a0

data/README.md

@@ -167,6 +167,32 @@ Run `spring stop` to stop Spring.
 
 For more information, see [this issue](https://github.com/Moove-it/sidekiq-scheduler/issues/35#issuecomment-48067183) and [Spring's README](https://github.com/rails/spring/blob/master/README.md).
 
+### Reloading the schedules
+
+The schedules can we updated from redis, every 5 seconds the redis is checked for schedule changes,
+to update an schedule you have to:
+
+ ```ruby
+   Sidekiq.set_schedule('some_name', { 'every' => ['1m'], 'class' => 'HardWorker' })
+ ```
+
+ If the schedule did not exist it'll we created if it existed it'll be updated
+
+ ### Testing
+
+ In your tests you can check that a schedule change has been set you have to:
+ ```ruby
+   require 'sidekiq'
+   require 'sidekiq-scheduler'
+   require 'sidekiq-scheduler/test'
+
+   Sidekiq.set_schedule('some_name', { 'every' => ['1m'], 'class' => 'HardWorker' })
+
+   Sidekiq::Scheduler.schedules => { 'every' => ['1m'], 'class' => 'HardWorker' }
+   Sidekiq::Scheduler.schedules_changed => ['every']
+ ```
+
+
 ### Time zones
 
 Note that if you use the cron syntax, this will be interpreted as in the server time zone

data/lib/sidekiq-scheduler.rb

@@ -1,4 +1,5 @@
 require 'sidekiq'
+require 'tilt/erb'
 
 require_relative 'sidekiq-scheduler/version'
 require_relative 'sidekiq-scheduler/manager'
@@ -23,4 +24,3 @@ Sidekiq.configure_server do |config|
   end
 
 end
-

data/lib/sidekiq-scheduler/manager.rb

@@ -1,4 +1,3 @@
-require 'celluloid'
 require 'redis'
 
 require 'sidekiq/util'
@@ -14,28 +13,19 @@ module SidekiqScheduler
   #
   class Manager
     include Sidekiq::Util
-    include Celluloid
-
-    def initialize(options={})
-      @enabled = options[:scheduler]
 
+    def initialize(options)
       Sidekiq::Scheduler.enabled = options[:enabled]
-      Sidekiq::Scheduler.dynamic = options[:dynamic] || false
+      Sidekiq::Scheduler.dynamic = options[:dynamic]
       Sidekiq.schedule = options[:schedule] if options[:schedule]
     end
 
     def stop
-      @enabled = false
+      Sidekiq::Scheduler.clear_schedule!
     end
 
     def start
-      # Load the schedule into rufus
-      # If dynamic is set, load that schedule otherwise use normal load
-      if @enabled && Sidekiq::Scheduler.dynamic && Sidekiq::Scheduler.enabled
-        Sidekiq::Scheduler.reload_schedule!
-      elsif @enabled && Sidekiq::Scheduler.enabled
-        Sidekiq::Scheduler.load_schedule!
-      end
+      Sidekiq::Scheduler.load_schedule!
     end
 
     def reset
@@ -44,4 +34,4 @@ module SidekiqScheduler
 
   end
 
-end
+end

data/lib/sidekiq-scheduler/version.rb

@@ -1,5 +1,5 @@
 module SidekiqScheduler
 
-  VERSION = '1.2.4'
+  VERSION = '2.0.0'
 
 end

data/lib/sidekiq-scheduler/web.rb

@@ -6,7 +6,7 @@ module SidekiqScheduler
 
     def self.registered(app)
       app.get '/recurring-jobs' do
-        @schedule = Sidekiq.schedule!
+        @schedule = (Sidekiq.schedule! || [])
 
         erb File.read(File.join(VIEW_PATH, 'recurring_jobs.erb'))
       end

data/lib/sidekiq/scheduler.rb

@@ -45,8 +45,13 @@ module Sidekiq
       if enabled
         logger.info 'Loading Schedule'
 
-        # Need to load the schedule from redis for the first time if dynamic
-        Sidekiq.reload_schedule! if dynamic
+        # Load schedule from redis for the first time if dynamic
+        if dynamic
+          Sidekiq.reload_schedule!
+          self.rufus_scheduler.every('5s') do
+            self.update_schedule
+          end
+        end
 
         logger.info 'Schedule empty! Set Sidekiq.schedule' if Sidekiq.schedule.empty?
 

data/test/lib/sidekiq/scheduler_test.rb

@@ -131,6 +131,40 @@ class ManagerTest < Minitest::Test
       assert_equal '/tmp/2', Sidekiq.schedule['some_ivar_job2']['args']
     end
 
+    it 'reloads the schedule from redis after 5 seconds when dynamic' do
+      Sidekiq.redis { |r| r.flushdb }
+      Sidekiq::Scheduler.clear_schedule!
+
+      Sidekiq::Scheduler.dynamic = true
+      Sidekiq.schedule = {
+        :some_ivar_job => {
+          'cron' => '* * * * *',
+          'class' => 'SomeIvarJob',
+          'args' => '/tmp'
+        }
+      }
+
+      Sidekiq::Scheduler.load_schedule!
+
+      assert Sidekiq::Scheduler.scheduled_jobs.include?('some_ivar_job')
+      assert !Sidekiq::Scheduler.scheduled_jobs.include?('some_ivar_job2')
+
+      Sidekiq.set_schedule(
+        'some_ivar_job2',
+        {
+          'cron' => '* * * * *',
+          'class' => 'SomeIvarJob',
+          'args' => '/tmp/2'
+        }
+      )
+
+      sleep(7)
+
+      assert Sidekiq::Scheduler.scheduled_jobs.include?('some_ivar_job')
+      assert Sidekiq::Scheduler.scheduled_jobs.include?('some_ivar_job2')
+    end
+
+
     it 'load_schedule_job loads a schedule' do
       Sidekiq::Scheduler.load_schedule_job(
         'some_ivar_job',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq-scheduler
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Morton Jonuschat
@@ -9,20 +9,20 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-11 00:00:00.000000000 Z
+date: 2015-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sidekiq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3'
 - !ruby/object:Gem::Dependency
@@ -205,7 +205,6 @@ files:
 - README.md
 - Rakefile
 - lib/sidekiq-scheduler.rb
-- lib/sidekiq-scheduler/capistrano.rb
 - lib/sidekiq-scheduler/manager.rb
 - lib/sidekiq-scheduler/schedule.rb
 - lib/sidekiq-scheduler/version.rb

data/lib/sidekiq-scheduler/capistrano.rb

@@ -1,54 +0,0 @@
-Capistrano::Configuration.instance.load do
-  before 'deploy',         'sidekiq_scheduler:quiet'
-  after  'deploy:stop',    'sidekiq_scheduler:stop'
-  after  'deploy:start',   'sidekiq_scheduler:start'
-  after  'deploy:restart', 'sidekiq_scheduler:restart'
-
-  _cset(:sidekiq_timeout) { 10 }
-  _cset(:sidekiq_role) { :app }
-
-  namespace :sidekiq_scheduler do
-
-    desc 'Quiet sidekiq-scheduler with sidekiq (stop accepting new work)'
-    task :quiet, roles: lambda { fetch(:sidekiq_role) } do
-      bundle_cmd = fetch(:bundle_cmd, 'bundle')
-      pid_file = "#{current_path}/tmp/pids/sidekiq.pid"
-      quiet_cmd = "#{bundle_cmd} exec sidekiqctl quiet #{pid_file}"
-
-      run "cd #{current_path} && if [ -f #{pid_file} ]; then #{quiet_cmd} ; fi"
-    end
-
-    desc 'Stop sidekiq-scheduler with sidekiq'
-    task :stop, roles: lambda { fetch(:sidekiq_role) } do
-      bundle_cmd = fetch(:bundle_cmd, 'bundle')
-      pid_file = "#{current_path}/tmp/pids/sidekiq.pid"
-      timeout = fetch(:sidekiq_timeout)
-      stop_cmd = "#{bundle_cmd} exec sidekiqctl stop #{pid_file} #{timeout}"
-
-      run "cd #{current_path} && if [ -f #{pid_file} ]; then #{stop_cmd} ; fi"
-    end
-
-    desc 'Start sidekiq-scheduler with sidekiq'
-    task :start, roles: lambda { fetch(:sidekiq_role) } do
-      rails_env = fetch(:rails_env, 'production')
-      bundle_cmd = fetch(:bundle_cmd, 'bundle')
-      log_file = "#{current_path}/log/sidekiq.log 2>&1 &"
-      pid_file = "#{current_path}/tmp/pids/sidekiq.pid"
-      start_cmd  = "#{bundle_cmd} exec sidekiq-scheduler start "
-      start_cmd += "-e #{rails_env} "
-      start_cmd += "-C #{current_path}/config/sidekiq.yml "
-      start_cmd += "-P #{pid_file} "
-      exec_cmd = "nohup #{start_cmd}"
-
-      run "cd #{current_path} ; nohup #{exec_cmd} >> #{log_file}", pty: false
-    end
-
-    desc 'Restart sidekiq-scheduler with sidekiq'
-    task :restart, roles: lambda { fetch(:sidekiq_role) } do
-      stop
-      start
-    end
-
-  end
-end
-