From f2da63369fcb754e3715091cc4fd2f93db42106e Mon Sep 17 00:00:00 2001 From: Elvin Efendi Date: Tue, 27 Oct 2015 14:49:52 -0400 Subject: better test framework, more specs and Travis CI --- lib/oxidized/worker.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/oxidized/worker.rb') diff --git a/lib/oxidized/worker.rb b/lib/oxidized/worker.rb index eea747e..b36929f 100644 --- a/lib/oxidized/worker.rb +++ b/lib/oxidized/worker.rb @@ -4,7 +4,7 @@ module Oxidized class Worker def initialize nodes @nodes = nodes - @jobs = Jobs.new CFG.threads, CFG.interval, @nodes + @jobs = Jobs.new(Oxidized.config.threads, Oxidized.config.interval, @nodes) Thread.abort_on_exception = true end @@ -18,7 +18,7 @@ module Oxidized # ask for next node in queue non destructive way nextnode = @nodes.first unless nextnode.last.nil? - break if nextnode.last.end + CFG.interval > Time.now.utc + break if nextnode.last.end + Oxidized.config.interval > Time.now.utc end # shift nodes and get the next node node = @nodes.get @@ -48,7 +48,7 @@ module Oxidized node.reset else msg = "#{node.name} status #{job.status}" - if node.retry < CFG.retries + if node.retry < Oxidized.config.retries node.retry += 1 msg += ", retry attempt #{node.retry}" @nodes.next node.name -- cgit v1.2.1