disbatch 0.0.7 → 0.0.8

data/bin/disbatchd

@@ -10,7 +10,7 @@ require 'trollop'
 opts = Trollop.options do
 	opt 'config', 'the disbatchd config file', :default => '/etc/disbatch/disbatchd.conf'
 	opt 'max', 'maximum number of threads per queue', :default => 10
-	opt 'plugins', 'path(s) to dispatch plugins', :multi => true
+	opt 'plugins', 'path(s) to dispatch plugins', :multi => true, :type => :string
 	opt 'force',  'force node registration'
 end
 
@@ -29,19 +29,45 @@ trap('TERM') { node.release; exit }
 trap('INT')  { node.release; exit }
 trap('QUIT') { node.release; exit }
 
+runners = {}
+
 EventMachine::run do
 
-	queues = Disbatch::Queue.get_all
+	EventMachine::add_periodic_timer(5) do
+
+		Disbatch::Queue.get_all.each do |queue|
+
+			# runner already exists
+			next if runners.has_key?(queue.id)
+
+			# node configured to ignore
+			# next if queue.nodes_ignore.include?(node.id)
+
+			# node pinned but not on this node
+			# next if !queue.nodes_ignore.empty? && !queue.nodes_ignore.include?(node.id)
+
+			# no plugin for queue
+			next unless Disbatch::Plugin[queue.plugin]
+
+			puts "Adding #{queue.plugin} runner for #{queue.id}"
 
-	queues.each do |queue|
+			runners[queue.id] = { 'tg' => ThreadGroup.new, 'queue' => queue }
 
-		next unless Disbatch::Plugin[queue.plugin]
+		end
+
+
+		runners.each do |id, runner|
+			puts "#{id}: #{runner['queue'].plugin}: #{runner['tg'].list.length}"
+		end
+
+	end
 
-		puts "Adding #{queue.plugin} runner for #{queue.id}"
+	EventMachine::add_periodic_timer(1) do
 
-		tg = ThreadGroup.new
+		runners.each do |id, runner|
 
-		EventMachine::add_periodic_timer(0.1) do
+			tg = runner['tg']
+			queue = runner['queue']
 
 			next unless ((nt = tg.list.length) < max && (np = queue.length) > 0)
 

data/lib/disbatch.rb

@@ -1,7 +1,7 @@
 module Disbatch
 
 	# engine version
-	VERSION = 'rdisbatch 0.0.7'
+	VERSION = 'rdisbatch 0.0.8'
 	# specification version
 	SPEC_VERSION   = '1.9'
 

metadata

@@ -2,7 +2,7 @@
 name: disbatch
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
   - Matthew Berg