From bd5e6347889e1ac07256228935f6d4a73c872f64 Mon Sep 17 00:00:00 2001
From: zedshaw <zedshaw@19e92222-5c0b-0410-8929-a290d50e31e9>
Date: Tue, 26 Sep 2006 04:51:02 +0000
Subject: Fixes a bug on OSX by changing from exec to system on restart.

git-svn-id: svn+ssh://rubyforge.org/var/svn/mongrel/trunk@352 19e92222-5c0b-0410-8929-a290d50e31e9
---
 bin/mongrel_rails | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'bin')

diff --git a/bin/mongrel_rails b/bin/mongrel_rails
index e5b5248..d96dc5d 100644
--- a/bin/mongrel_rails
+++ b/bin/mongrel_rails
@@ -139,7 +139,15 @@ module Mongrel
         if RUBY_PLATFORM !~ /mswin/
           cmd = "ruby #{__FILE__} start #{original_args.join(' ')}"
           config.log "Restarting with arguments:  #{cmd}"
-          exec cmd
+          config.stop
+          config.remove_pid_file
+
+          if config.defaults[:daemon]
+            system cmd
+          else
+            STDERR.puts "Can't restart unless in daemon mode."
+            exit 1
+          end
         else
           config.log "Win32 does not support restarts. Exiting."
         end
-- 
cgit v1.2.3-24-ge0c7