Merge pull request #303 from fxposter/master

Fix for high CPU load. Fixes #260 and #299.
This commit is contained in:
David Dollar committed 2013-01-14 05:06:44 -08:00
commit 443994d3b5
1 file changed
+6 -2
+6 -2
View File
@@ -275,8 +275,12 @@ private
loop do loop do
io = IO.select(@readers.values, nil, nil, 30) io = IO.select(@readers.values, nil, nil, 30)
(io.nil? ? [] : io.first).each do |reader| (io.nil? ? [] : io.first).each do |reader|
data = reader.gets if reader.eof?
output_with_mutex name_for(@readers.invert[reader]), data @readers.delete_if { |key, value| value == reader }
else
data = reader.gets
output_with_mutex name_for(@readers.invert[reader]), data
end
end end
end end
rescue Exception => ex rescue Exception => ex