From f2da63369fcb754e3715091cc4fd2f93db42106e Mon Sep 17 00:00:00 2001
From: Elvin Efendi <elvin.efendiev@shopify.com>
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


From 1c4f886e883f947b649613a21955929fa6d7e94c Mon Sep 17 00:00:00 2001
From: Elvin Efendi <elvin.efendiev@shopify.com>
Date: Wed, 9 Dec 2015 23:43:32 -0500
Subject: refactor and fix bugs introduced with new changes

---
 lib/oxidized/worker.rb | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'lib/oxidized/worker.rb')

diff --git a/lib/oxidized/worker.rb b/lib/oxidized/worker.rb
index b36929f..15977e2 100644
--- a/lib/oxidized/worker.rb
+++ b/lib/oxidized/worker.rb
@@ -14,7 +14,7 @@ module Oxidized
       ended.each      { |job| process job }
       @jobs.work
       while @jobs.size < @jobs.want
-        Log.debug "Jobs #{@jobs.size}, Want: #{@jobs.want}"
+        Oxidized.logger.debug "Jobs #{@jobs.size}, Want: #{@jobs.want}"
         # ask for next node in queue non destructive way
         nextnode = @nodes.first
         unless nextnode.last.nil?
@@ -41,7 +41,7 @@ module Oxidized
         msg += " with message '#{node.msg}'" if node.msg
         if node.output.new.store node.name, job.config,
                               :msg => msg, :user => node.user, :group => node.group
-          Log.info "Configuration updated for #{node.group}/#{node.name}"
+          Oxidized.logger.info "Configuration updated for #{node.group}/#{node.name}"
           Oxidized.Hooks.handle :post_store, :node => node,
                                              :job => job
         end
@@ -58,10 +58,10 @@ module Oxidized
           Oxidized.Hooks.handle :node_fail, :node => node,
                                             :job => job
         end
-        Log.warn msg
+        Oxidized.logger.warn msg
       end
     rescue NodeNotFound
-      Log.warn "#{node.name} not found, removed while collecting?"
+      Oxidized.logger.warn "#{node.name} not found, removed while collecting?"
     end
 
   end
-- 
cgit v1.2.1