about summary refs log tree commit homepage
path: root/lib/mongrel.rb
diff options
context:
space:
mode:
authorevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-10-18 21:03:53 +0000
committerevanweaver <evanweaver@19e92222-5c0b-0410-8929-a290d50e31e9>2007-10-18 21:03:53 +0000
commit28dbbe752771c4a213f44140e3787c74770b87e6 (patch)
tree917d3a76e23015a1df8f5085126dde4507946c5d /lib/mongrel.rb
parent8a68f2e8216142ecd41d8b020a365065029ffb07 (diff)
downloadunicorn-28dbbe752771c4a213f44140e3787c74770b87e6.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@694 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'lib/mongrel.rb')
-rw-r--r--lib/mongrel.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/mongrel.rb b/lib/mongrel.rb
index 1d95714..a320411 100644
--- a/lib/mongrel.rb
+++ b/lib/mongrel.rb
@@ -809,8 +809,12 @@ module Mongrel
 
     # Stops the acceptor thread and then causes the worker threads to finish
     # off the request queue before finally exiting.
-    def stop
+    def stop(synchronous=false)
       @acceptor.raise(StopServer.new)
+
+      if synchronous        
+        sleep(0.5) while @acceptor.alive?
+      end
     end
 
   end