diff --git a/lib/crono/cli.rb b/lib/crono/cli.rb index 478c755..f10f545 100644 --- a/lib/crono/cli.rb +++ b/lib/crono/cli.rb @@ -62,7 +62,7 @@ module Crono logger.info 'Jobs:' Crono.scheduler.jobs.each do |job| logger.info "'#{job.performer}' with rule '#{job.period.description}'"\ - "next time will perform at #{job.next}" + " next time will perform at #{job.next}" end end @@ -80,7 +80,7 @@ module Crono end def start_working_loop - while true + loop do next_time, jobs = Crono.scheduler.next_jobs sleep(next_time - Time.now) jobs.each(&:perform) diff --git a/lib/crono/job.rb b/lib/crono/job.rb index 24a7922..276e373 100644 --- a/lib/crono/job.rb +++ b/lib/crono/job.rb @@ -60,9 +60,7 @@ module Crono end def perform_job - performer_instance = performer.new - performer_instance.instance_variable_set(:@_crono_job, self) - performer_instance.perform + performer.new.perform finished_time_sec = format('%.2f', Time.now - last_performed_at) rescue StandardError => e handle_job_fail(e, finished_time_sec) diff --git a/spec/job_spec.rb b/spec/job_spec.rb index 6eb8c45..029e50c 100644 --- a/spec/job_spec.rb +++ b/spec/job_spec.rb @@ -32,23 +32,10 @@ describe Crono::Job do expect(saved_log).to include 'Some error' end - xit 'should set Job#healthy to true if perform ok' do - class TestJob - def perform - @_crono_job - end - end - job.perform.join - end - it 'should set Job#healthy to false if perform with error' do failing_job.perform.join expect(failing_job.healthy).to be false end - - xit 'should set @_crono_job variable to instance' do - job.perform - end end describe '#description' do