summaryrefslogtreecommitdiff
path: root/lib/oxidized/worker.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/oxidized/worker.rb')
-rw-r--r--lib/oxidized/worker.rb6
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/oxidized/worker.rb b/lib/oxidized/worker.rb
index 99fc8b8..7ed70ac 100644
--- a/lib/oxidized/worker.rb
+++ b/lib/oxidized/worker.rb
@@ -2,12 +2,9 @@ module Oxidized
require 'oxidized/job'
require 'oxidized/jobs'
class Worker
- MAX_INTER_JOB_GAP = 300
-
def initialize nodes
@nodes = nodes
@jobs = Jobs.new CFG.threads, CFG.interval, @nodes
- @last = Time.now.utc
Thread.abort_on_exception = true
end
@@ -15,7 +12,7 @@ module Oxidized
ended = []
@jobs.delete_if { |job| ended << job if not job.alive? }
ended.each { |job| process job }
- @jobs.add_job if Time.now.utc - @last > MAX_INTER_JOB_GAP
+ @jobs.work
while @jobs.size < @jobs.want
Log.debug "Jobs #{@jobs.size}, Want: #{@jobs.want}"
# ask for next node in queue non destructive way
@@ -26,7 +23,6 @@ module Oxidized
# shift nodes and get the next node
node = @nodes.get
node.running? ? next : node.running = true
- @last = Time.now.utc
@jobs.push Job.new node
end
end