diff options
author | evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9> | 2007-10-18 02:08:55 +0000 |
---|---|---|
committer | evanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9> | 2007-10-18 02:08:55 +0000 |
commit | becb1bca3d50efa12fba393b68bb0d157ffc6f74 (patch) | |
tree | 13d3512cbba82c4a2588355f1b2e11ae6aef8cdf /lib/mongrel | |
parent | a3ccea20cb689cf45256e879aaafdd5dd1de2b24 (diff) | |
download | unicorn-becb1bca3d50efa12fba393b68bb0d157ffc6f74.tar.gz |
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@681 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'lib/mongrel')
-rw-r--r-- | lib/mongrel/configurator.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/mongrel/configurator.rb b/lib/mongrel/configurator.rb index 867e89d..cd77b19 100644 --- a/lib/mongrel/configurator.rb +++ b/lib/mongrel/configurator.rb @@ -1,7 +1,6 @@ require 'yaml' require 'etc' - module Mongrel # Implements a simple DSL for configuring a Mongrel server for your # purposes. More used by framework implementers to setup Mongrel @@ -290,7 +289,10 @@ module Mongrel # assumes that you don't want to restart. def stop(needs_restart=false) @listeners.each {|name,s| - s.stop + s.stop + + # XXX Try to get JRuby to wait for the thread to actually stop + s.acceptor.join } @needs_restart = needs_restart |