Permalink
Browse files

Merge pull request #272 from silviorelli/master

High cpu load patch by @mauricio - fixes #260
  • Loading branch information...
2 parents 8998e9a + 9da4e38 commit 0cd41fee7f436beeef28f733002b0e0a884f11c8 @ddollar committed Oct 8, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 lib/foreman/engine.rb
View
@@ -273,7 +273,7 @@ def watch_for_output
Thread.new do
begin
loop do
- (IO.select(@readers.values).first || []).each do |reader|
+ (IO.select(@readers.values, nil, nil, 30).first || []).each do |reader|
data = reader.gets
output_with_mutex name_for(@readers.invert[reader]), data
end

0 comments on commit 0cd41fe

Please sign in to comment.