Compare commits

..
5 Commits
Author SHA1 Message Date
David Dollar 8b49256175 0.60.2 2012-10-08 10:47:00 -04:00
David Dollar 37d777f224 update docs 2012-10-08 10:46:34 -04:00
David Dollar 73fc059634 Merge pull request #273 from silviorelli/master
Fix for fix on issue #260
2012-10-08 07:46:16 -07:00
Silvio Relli f7b7029cc0 Fix for nil value on io select loop, fixes #260 2012-10-08 16:40:37 +02:00
David Dollar 3a101ec7dd update changelog 2012-10-08 10:31:10 -04:00
5 changed files with 9 additions and 4 deletions
+4
View File
@@ -1,3 +1,7 @@
## 0.60.1 (2012-10-08)
* sleep on select() to avoid spinning the cpu [Silvio Relli]
## 0.60.0 (2012-09-25) ## 0.60.0 (2012-09-25)
* foreman run can run things from the Procfile like heroku run. [Dan Peterson] * foreman run can run things from the Procfile like heroku run. [Dan Peterson]
+1 -1
View File
@@ -1,7 +1,7 @@
PATH PATH
remote: . remote: .
specs: specs:
foreman (0.60.1) foreman (0.60.2)
thor (>= 0.13.6) thor (>= 0.13.6)
GEM GEM
+2 -1
View File
@@ -273,7 +273,8 @@ private
Thread.new do Thread.new do
begin begin
loop do loop do
(IO.select(@readers.values, nil, nil, 30).first || []).each do |reader| io = IO.select(@readers.values, nil, nil, 30)
(io.nil? ? [] : io.first).each do |reader|
data = reader.gets data = reader.gets
output_with_mutex name_for(@readers.invert[reader]), data output_with_mutex name_for(@readers.invert[reader]), data
end end
+1 -1
View File
@@ -1,5 +1,5 @@
module Foreman module Foreman
VERSION = "0.60.1" VERSION = "0.60.2"
end end
+1 -1
View File
@@ -1,7 +1,7 @@
.\" generated with Ronn/v0.7.3 .\" generated with Ronn/v0.7.3
.\" http://github.com/rtomayko/ronn/tree/0.7.3 .\" http://github.com/rtomayko/ronn/tree/0.7.3
. .
.TH "FOREMAN" "1" "June 2012" "Foreman 0.60.0" "Foreman Manual" .TH "FOREMAN" "1" "August 2012" "Foreman 0.60.1" "Foreman Manual"
. .
.SH "NAME" .SH "NAME"
\fBforeman\fR \- manage Procfile\-based applications \fBforeman\fR \- manage Procfile\-based applications