change to args which will be passed to Job#perform

This commit is contained in:
Jannis Hübl
2016-01-14 09:33:14 +01:00
parent dd4f92b569
commit 89f3b9a8a1
6 changed files with 30 additions and 30 deletions

View File

@@ -6,13 +6,13 @@ module Crono
class Job
include Logging
attr_accessor :performer, :period, :data, :last_performed_at,
attr_accessor :performer, :period, :job_args, :last_performed_at,
:next_performed_at, :job_log, :job_logger, :healthy, :execution_interval
def initialize(performer, period, data)
def initialize(performer, period, job_args)
self.execution_interval = 0.minutes
self.performer, self.period = performer, period
self.data = JSON.generate(data) if data
self.job_args = JSON.generate(job_args)
self.job_log = StringIO.new
self.job_logger = Logger.new(job_log)
self.next_performed_at = period.next
@@ -65,13 +65,11 @@ 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, data: data)
healthy: healthy, args: job_args)
end
def perform_job
args = []
args << JSON.parse(data) if data
performer.new(*args).perform
performer.new.perform *JSON.parse(job_args)
rescue StandardError => e
handle_job_fail(e)
else

View File

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

View File

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