sskirby-hydra 0.16.9 → 0.16.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- data/VERSION +1 -1
- data/lib/hydra/master.rb +4 -11
- data/lib/hydra/messaging_io.rb +1 -3
- metadata +2 -2
data/VERSION
CHANGED
@@ -1 +1 @@
|
|
1
|
-
0.16.
|
1
|
+
0.16.10
|
data/lib/hydra/master.rb
CHANGED
@@ -29,17 +29,12 @@ module Hydra #:nodoc:
|
|
29
29
|
# * :autosort
|
30
30
|
# * Set to false to disable automatic sorting by historical run-time per file
|
31
31
|
def initialize(opts = { })
|
32
|
-
#at_exit do
|
33
32
|
trap("SIGINT") do
|
34
|
-
|
35
|
-
|
36
|
-
puts @incomplete_files.join("\n")
|
37
|
-
rescue
|
38
|
-
trace $!.inspect
|
39
|
-
trace $!.backtrace.join("\n")
|
40
|
-
end
|
33
|
+
puts "Testing halted by user. Untested files:"
|
34
|
+
puts @incomplete_files.join("\n")
|
41
35
|
exit
|
42
36
|
end
|
37
|
+
|
43
38
|
opts.stringify_keys!
|
44
39
|
config_file = opts.delete('config') { nil }
|
45
40
|
if config_file
|
@@ -183,7 +178,7 @@ module Hydra #:nodoc:
|
|
183
178
|
while true
|
184
179
|
begin
|
185
180
|
message = worker[:io].gets
|
186
|
-
trace "got message:
|
181
|
+
trace "got message: #{message}"
|
187
182
|
# if it exists and its for me.
|
188
183
|
# SSH gives us back echoes, so we need to ignore our own messages
|
189
184
|
if message and !message.class.to_s.index("Worker").nil?
|
@@ -191,8 +186,6 @@ module Hydra #:nodoc:
|
|
191
186
|
end
|
192
187
|
rescue IOError
|
193
188
|
trace "lost Worker [#{worker.inspect}]"
|
194
|
-
trace $!.inspect
|
195
|
-
trace $!.backtrace.join("\n")
|
196
189
|
Thread.exit
|
197
190
|
end
|
198
191
|
end
|
data/lib/hydra/messaging_io.rb
CHANGED
@@ -14,7 +14,7 @@ module Hydra #:nodoc:
|
|
14
14
|
return Message.build(eval(message.chomp))
|
15
15
|
rescue SyntaxError, NameError
|
16
16
|
# uncomment to help catch remote errors by seeing all traffic
|
17
|
-
|
17
|
+
#$stderr.write "Not a message: [#{message.inspect}]\n"
|
18
18
|
return gets
|
19
19
|
end
|
20
20
|
|
@@ -26,8 +26,6 @@ module Hydra #:nodoc:
|
|
26
26
|
raise UnprocessableMessage unless message.is_a?(Hydra::Message)
|
27
27
|
@writer.write(message.serialize+"\n")
|
28
28
|
rescue Errno::EPIPE
|
29
|
-
$stderr.write $!.inspect
|
30
|
-
$stderr.write $!.backtrace.join("\n")
|
31
29
|
raise IOError
|
32
30
|
end
|
33
31
|
|