mirror of
https://github.com/plashchynski/crono.git
synced 2026-04-23 17:28:45 +02:00
Add ability to define minimal time between job executions to support multiple corno nodes, so two different nodes will not execute the same job
This commit is contained in:
@@ -1,3 +1,8 @@
|
|||||||
|
0.9.1
|
||||||
|
-----------
|
||||||
|
- Add ability to define minimal time between job executions to support multiple corno nodes, so two different nodes will not execute the same job
|
||||||
|
|
||||||
|
|
||||||
0.8.9
|
0.8.9
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
|
|||||||
@@ -7,9 +7,10 @@ module Crono
|
|||||||
include Logging
|
include Logging
|
||||||
|
|
||||||
attr_accessor :performer, :period, :last_performed_at,
|
attr_accessor :performer, :period, :last_performed_at,
|
||||||
:next_performed_at, :job_log, :job_logger, :healthy
|
:next_performed_at, :job_log, :job_logger, :healthy, :execution_interval
|
||||||
|
|
||||||
def initialize(performer, period)
|
def initialize(performer, period)
|
||||||
|
self.execution_interval = 0.minutes
|
||||||
self.performer, self.period = performer, period
|
self.performer, self.period = performer, period
|
||||||
self.job_log = StringIO.new
|
self.job_log = StringIO.new
|
||||||
self.job_logger = Logger.new(job_log)
|
self.job_logger = Logger.new(job_log)
|
||||||
@@ -31,6 +32,8 @@ module Crono
|
|||||||
end
|
end
|
||||||
|
|
||||||
def perform
|
def perform
|
||||||
|
return Thread.new {} if perform_before_interval?
|
||||||
|
|
||||||
log "Perform #{performer}"
|
log "Perform #{performer}"
|
||||||
self.last_performed_at = Time.now
|
self.last_performed_at = Time.now
|
||||||
self.next_performed_at = period.next(since: last_performed_at)
|
self.next_performed_at = period.next(since: last_performed_at)
|
||||||
@@ -102,5 +105,9 @@ module Crono
|
|||||||
def model
|
def model
|
||||||
@model ||= Crono::CronoJob.find_or_create_by(job_id: job_id)
|
@model ||= Crono::CronoJob.find_or_create_by(job_id: job_id)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def perform_before_interval?
|
||||||
|
self.last_performed_at.present? && self.last_performed_at > execution_interval.ago
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -7,8 +7,14 @@ module Crono
|
|||||||
end
|
end
|
||||||
|
|
||||||
def every(period, *args)
|
def every(period, *args)
|
||||||
job = Job.new(@performer, Period.new(period, *args))
|
@job = Job.new(@performer, Period.new(period, *args))
|
||||||
@scheduler.add_job(job)
|
@scheduler.add_job(@job)
|
||||||
|
self
|
||||||
|
end
|
||||||
|
|
||||||
|
def once_per(execution_interval)
|
||||||
|
@job.execution_interval = execution_interval if @job
|
||||||
|
self
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
module Crono
|
module Crono
|
||||||
VERSION = '0.9.0'
|
VERSION = '0.9.1'
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -36,6 +36,32 @@ describe Crono::Job do
|
|||||||
failing_job.perform.join
|
failing_job.perform.join
|
||||||
expect(failing_job.healthy).to be false
|
expect(failing_job.healthy).to be false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'should execute one' do
|
||||||
|
job.execution_interval = 5.minutes
|
||||||
|
|
||||||
|
expect(job).to receive(:perform_job).once
|
||||||
|
job.perform.join
|
||||||
|
thread = job.perform.join
|
||||||
|
expect(thread).to be_stop
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should execute twice' do
|
||||||
|
job.execution_interval = 0.minutes
|
||||||
|
|
||||||
|
test_preform_job_twice
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should execute twice without initialize execution_interval' do
|
||||||
|
test_preform_job_twice
|
||||||
|
end
|
||||||
|
|
||||||
|
def test_preform_job_twice
|
||||||
|
expect(job).to receive(:perform_job).twice
|
||||||
|
job.perform.join
|
||||||
|
thread = job.perform.join
|
||||||
|
expect(thread).to be_stop
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe '#description' do
|
describe '#description' do
|
||||||
|
|||||||
@@ -5,4 +5,17 @@ describe Crono::PerformerProxy do
|
|||||||
expect(Crono.scheduler).to receive(:add_job).with(kind_of(Crono::Job))
|
expect(Crono.scheduler).to receive(:add_job).with(kind_of(Crono::Job))
|
||||||
Crono.perform(TestJob).every(2.days, at: '15:30')
|
Crono.perform(TestJob).every(2.days, at: '15:30')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
it 'should set execution interval' do
|
||||||
|
allow(Crono).to receive(:scheduler).and_return(Crono::Scheduler.new)
|
||||||
|
expect_any_instance_of(Crono::Job).to receive(:execution_interval=).with(0.minutes).once
|
||||||
|
expect_any_instance_of(Crono::Job).to receive(:execution_interval=).with(10.minutes).once
|
||||||
|
Crono.perform(TestJob).every(2.days, at: '15:30').once_per 10.minutes
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'do nothing when job not initalized' do
|
||||||
|
expect_any_instance_of(Crono::Job).not_to receive(:execution_interval=)
|
||||||
|
expect_any_instance_of(described_class).to receive(:once_per)
|
||||||
|
Crono.perform(TestJob).once_per 10.minutes
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user