From dae8f6f80c010933f958d38abe315b9ef7da803f Mon Sep 17 00:00:00 2001
From: keith <keith>
Date: Fri, 30 May 2008 15:50:56 +0000
Subject: Slightly better tested

---
 script/restart-mongrel | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'script/restart-mongrel')

diff --git a/script/restart-mongrel b/script/restart-mongrel
index 9de4122a0..c8d4436b3 100755
--- a/script/restart-mongrel
+++ b/script/restart-mongrel
@@ -9,17 +9,15 @@ if [ -e log/mongrel.pid ]
 then
     ruby -I/usr/lib/ruby/ /usr/bin/mongrel_rails stop
     sleep 5s
+    if ( ps h -p `cat log/mongrel.pid` )
+    then
+	echo "kill -9 ing `cat log/mongrel.pid` because it failed to stop"
+	kill -9 `cat log/mongrel.pid`
+	sleep 2s
+    fi
     if [ -e log/mongrel.pid ]
     then
-	    if ( ps h -p `cat log/mongrel.pid`45 )
-	    then
-	    	echo "kill -9 ing `cat log/mongrel.pid` because it failed to stop"
-	    	kill -9 `cat log/mongrel.pid`
-		sleep 2s
-	    fi
-	    if [ -e log/mongrel.pid ]
-	    	rm log/mongrel.pid
-	    fi
+	rm log/mongrel.pid
     fi
     ruby -I/usr/lib/ruby/ /usr/bin/mongrel_rails start -d --debug
 else
-- 
cgit v1.2.3