Skip to content

Commit

Permalink
Fix timeout handling when running command
Browse files Browse the repository at this point in the history
  • Loading branch information
macournoyer committed May 26, 2008
1 parent 2fba06e commit 44d6ce7
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
== 0.8.2 ??? release
* Fix hanging when restarting and no process is running in single server move, fixes #67
* [bug] Fix timeout handling when running command
* [bug] Fix hanging when restarting and no process is running in single server move, fixes #67
* Added Mack adapter [markbates]
* Allow rackup .rb files by getting a conventionally named constant as the app [bmizerany]

Expand Down
2 changes: 1 addition & 1 deletion lib/thin/controllers/controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ def config
protected
# Wait for a pid file to either be created or deleted.
def wait_for_file(state, file)
Timeout.timeout(@options[:log] || 30) do
Timeout.timeout(@options[:timeout] || 30) do
case state
when :creation then sleep 0.1 until File.exist?(file)
when :deletion then sleep 0.1 while File.exist?(file)
Expand Down
1 change: 1 addition & 0 deletions site/thin.rb
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ def users_page
li { a "Look to the Stars", :href => 'http://www.looktothestars.org/' }
li { a "kluster", :href => 'http://kluster.com'}
li { a "SocialSpark", :href => 'http://socialspark.com'}
li { a "Tanga.com", :href => 'http://tanga.com'}
end

p { "If you'd like to have your site listed here, #{a 'drop me an email', :href => 'mailto:[email protected]'}" }
Expand Down

0 comments on commit 44d6ce7

Please sign in to comment.