lib/hydra/master.rb in sskirby-hydra-0.16.9 vs lib/hydra/master.rb in sskirby-hydra-0.16.10

- old
+ new

@@ -27,21 +27,16 @@ # * :verbose # * Set to true to see lots of Hydra output (for debugging) # * :autosort # * Set to false to disable automatic sorting by historical run-time per file def initialize(opts = { }) - #at_exit do trap("SIGINT") do - begin - puts "Testing halted by user. Untested files:" - puts @incomplete_files.join("\n") - rescue - trace $!.inspect - trace $!.backtrace.join("\n") - end + puts "Testing halted by user. Untested files:" + puts @incomplete_files.join("\n") exit end + opts.stringify_keys! config_file = opts.delete('config') { nil } if config_file opts.merge!(YAML.load_file(config_file).stringify_keys!) end @@ -181,19 +176,17 @@ @workers << worker end while true begin message = worker[:io].gets - trace "got message: '#{message}'" + trace "got message: #{message}" # if it exists and its for me. # SSH gives us back echoes, so we need to ignore our own messages if message and !message.class.to_s.index("Worker").nil? message.handle(self, worker) end rescue IOError trace "lost Worker [#{worker.inspect}]" - trace $!.inspect - trace $!.backtrace.join("\n") Thread.exit end end end end