add data to Cron.perform which will be passed to ExampleJob.new(data).perform

This commit is contained in:
Jannis Hübl
2016-01-13 17:44:27 +01:00
parent 6881109934
commit dd4f92b569
6 changed files with 46 additions and 15 deletions

View File

@@ -6,12 +6,13 @@ module Crono
class Job
include Logging
attr_accessor :performer, :period, :last_performed_at,
attr_accessor :performer, :period, :data, :last_performed_at,
:next_performed_at, :job_log, :job_logger, :healthy, :execution_interval
def initialize(performer, period)
def initialize(performer, period, data)
self.execution_interval = 0.minutes
self.performer, self.period = performer, period
self.data = JSON.generate(data) if data
self.job_log = StringIO.new
self.job_logger = Logger.new(job_log)
self.next_performed_at = period.next
@@ -64,11 +65,13 @@ module Crono
saved_log = model.reload.log || ''
log_to_save = saved_log + job_log.string
model.update(last_performed_at: last_performed_at, log: log_to_save,
healthy: healthy)
healthy: healthy, data: data)
end
def perform_job
performer.new.perform
args = []
args << JSON.parse(data) if data
performer.new(*args).perform
rescue StandardError => e
handle_job_fail(e)
else

View File

@@ -1,13 +1,14 @@
module Crono
# Crono::PerformerProxy is a proxy used in cronotab.rb semantic
class PerformerProxy
def initialize(performer, scheduler)
def initialize(performer, scheduler, data)
@performer = performer
@scheduler = scheduler
@data = data
end
def every(period, *args)
@job = Job.new(@performer, Period.new(period, *args))
@job = Job.new(@performer, Period.new(period, *args), @data)
@scheduler.add_job(@job)
self
end
@@ -18,7 +19,7 @@ module Crono
end
end
def self.perform(performer)
PerformerProxy.new(performer, Crono.scheduler)
def self.perform(performer, data=nil)
PerformerProxy.new(performer, Crono.scheduler, data)
end
end

View File

@@ -5,6 +5,7 @@ class CreateCronoJobs < ActiveRecord::Migration
t.text :log
t.datetime :last_performed_at
t.boolean :healthy
t.text :data
t.timestamps null: false
end
add_index :crono_jobs, [:job_id], unique: true

View File

@@ -2,14 +2,20 @@ require 'spec_helper'
describe Crono::Job do
let(:period) { Crono::Period.new(2.day, at: '15:00') }
let(:job) { Crono::Job.new(TestJob, period) }
let(:failing_job) { Crono::Job.new(TestFailingJob, period) }
let(:data) {{some: 'data'}}
let(:job) { Crono::Job.new(TestJob, period, nil) }
let(:job_with_data) { Crono::Job.new(TestJob, period, data) }
let(:failing_job) { Crono::Job.new(TestFailingJob, period, nil) }
it 'should contain performer and period' do
expect(job.performer).to be TestJob
expect(job.period).to be period
end
it 'should contain data as JSON String' do
expect(job_with_data.data).to eq '{"some":"data"}'
end
describe '#next' do
it 'should return next performing time according to period' do
expect(job.next).to be_eql period.next
@@ -56,6 +62,18 @@ describe Crono::Job do
test_preform_job_twice
end
it 'should call perform of performer' do
expect(TestJob).to receive(:new).with(no_args)
thread = job.perform.join
expect(thread).to be_stop
end
it 'should call perform of performer with data' do
expect(TestJob).to receive(:new).with({"some" => "data"})
thread = job_with_data.perform.join
expect(thread).to be_stop
end
def test_preform_job_twice
expect(job).to receive(:perform_job).twice
job.perform.join
@@ -80,10 +98,12 @@ describe Crono::Job do
it 'should update saved job' do
job.last_performed_at = Time.now
job.healthy = true
job.data = JSON.generate({some: 'data'})
job.save
@crono_job = Crono::CronoJob.find_by(job_id: job.job_id)
expect(@crono_job.last_performed_at.utc.to_s).to be_eql job.last_performed_at.utc.to_s
expect(@crono_job.healthy).to be true
expect(@crono_job.data).to eq '{"some":"data"}'
end
it 'should save and truncate job log' do
@@ -102,7 +122,7 @@ describe Crono::Job do
end
it 'should load last_performed_at from DB' do
@job = Crono::Job.new(TestJob, period)
@job = Crono::Job.new(TestJob, period, data)
@job.load
expect(@job.last_performed_at.utc.to_s).to be_eql @saved_last_performed_at.utc.to_s
end

View File

@@ -18,4 +18,10 @@ describe Crono::PerformerProxy do
expect_any_instance_of(described_class).to receive(:once_per)
Crono.perform(TestJob).once_per 10.minutes
end
it 'should add job with data to schedule' do
expect(Crono::Job).to receive(:new).with(TestJob, kind_of(Crono::Period), {some: 'data'})
allow(Crono.scheduler).to receive(:add_job)
Crono.perform(TestJob, {some: 'data'}).every(2.days, at: '15:30')
end
end

View File

@@ -5,7 +5,7 @@ describe Crono::Scheduler do
describe '#add_job' do
it 'should call Job#load on Job' do
@job = Crono::Job.new(TestJob, Crono::Period.new(10.day, at: '04:05'))
@job = Crono::Job.new(TestJob, Crono::Period.new(10.day, at: '04:05'), nil)
expect(@job).to receive(:load)
scheduler.add_job(@job)
end
@@ -17,7 +17,7 @@ describe Crono::Scheduler do
Crono::Period.new(3.days, at: 10.minutes.from_now.strftime('%H:%M')),
Crono::Period.new(1.day, at: 20.minutes.from_now.strftime('%H:%M')),
Crono::Period.new(7.days, at: 40.minutes.from_now.strftime('%H:%M'))
].map { |period| Crono::Job.new(TestJob, period) }
].map { |period| Crono::Job.new(TestJob, period, nil) }
time, jobs = scheduler.next_jobs
expect(jobs).to be_eql [jobs[0]]
@@ -29,7 +29,7 @@ describe Crono::Scheduler do
Crono::Period.new(1.day, at: time.strftime('%H:%M')),
Crono::Period.new(1.day, at: time.strftime('%H:%M')),
Crono::Period.new(1.day, at: 10.minutes.from_now.strftime('%H:%M'))
].map { |period| Crono::Job.new(TestJob, period) }
].map { |period| Crono::Job.new(TestJob, period, nil) }
time, jobs = scheduler.next_jobs
expect(jobs).to be_eql [jobs[0], jobs[1]]
@@ -40,7 +40,7 @@ describe Crono::Scheduler do
Crono::Period.new(10.seconds),
Crono::Period.new(10.seconds),
Crono::Period.new(1.day, at: 10.minutes.from_now.strftime('%H:%M'))
].map { |period| Crono::Job.new(TestJob, period) }
].map { |period| Crono::Job.new(TestJob, period, nil) }
_, next_jobs = scheduler.next_jobs
expect(next_jobs).to be_eql [jobs[0]]