about summary refs log tree commit homepage
path: root/lib/mongrel/rails.rb
diff options
context:
space:
mode:
authorzedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>2006-08-12 19:10:57 +0000
committerzedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>2006-08-12 19:10:57 +0000
commit4efe29da989a8b1783e7a1261098c346d6370e9e (patch)
tree5ebcef3030784f3a84a16e76f9c0c8b94676681c /lib/mongrel/rails.rb
parentf9f5412a096e842598591916e0eff1e9356650ea (diff)
downloadunicorn-4efe29da989a8b1783e7a1261098c346d6370e9e.tar.gz
git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@314 19e92222-5c0b-0410-8929-a290d50e31e9
Diffstat (limited to 'lib/mongrel/rails.rb')
-rw-r--r--lib/mongrel/rails.rb5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/mongrel/rails.rb b/lib/mongrel/rails.rb
index 2cd538e..4ee21c1 100644
--- a/lib/mongrel/rails.rb
+++ b/lib/mongrel/rails.rb
@@ -99,11 +99,14 @@ module Mongrel
       # Does the internal reload for Rails.  It might work for most cases, but
       # sometimes you get exceptions.  In that case just do a real restart.
       def reload!
-        @guard.synchronize do
+        begin
+          lock!
           $".replace $orig_dollar_quote
           GC.start
           Dispatcher.reset_application!
           ActionController::Routing::Routes.reload
+        ensure
+          unlock!
         end
       end
     end