From 83cf17fe2bc52a731db05ca59d361d9fcaf6f0aa Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Thu, 21 Aug 2008 03:03:47 +0000
Subject: [PATCH] Monotone-Parent: d56786bfd4252cac6fabbec16a507890e9920737
 Monotone-Revision: ebfcfa3a765664e839e40597a7fe36e370f2a76c

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-08-21T03:03:47
Monotone-Branch: ca.inverse.sogo
---
 Scripts/sogo-init.d-redhat | 10 +++++++++-
 Scripts/sogod-wrapper      | 16 ++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/Scripts/sogo-init.d-redhat b/Scripts/sogo-init.d-redhat
index 1d1fd7a0a..c5efe52f5 100755
--- a/Scripts/sogo-init.d-redhat
+++ b/Scripts/sogo-init.d-redhat
@@ -90,7 +90,15 @@ case "$1" in
 	;;
   restart|force-reload)
 	echo $"Restarting $DESC: "
-	$0 stop && sleep 2 && $0 start
+	for ((a=1; a <= PREFORK ; a++))
+	do
+	  pid="`cat ${PIDFILE}${a}`"
+	  kill $pid
+	  rm -f ${PIDFILE}${a}
+	  sleep 1
+	  daemon --user=sogo $DAEMON $a
+	  echo "$DAEMON $a restarted"
+	done
 	;;
   status)
   	status $REAL_DAEMON
diff --git a/Scripts/sogod-wrapper b/Scripts/sogod-wrapper
index bd89e6d7a..203584285 100755
--- a/Scripts/sogod-wrapper
+++ b/Scripts/sogod-wrapper
@@ -40,21 +40,21 @@ else
 fi
 fi
 
-if [ -f $GNUSTEP_USER_ROOT/Tools/sogod-0.9 ]; then
+if [ -x $GNUSTEP_USER_ROOT/Tools/sogod-0.9 ]; then
     sogod="$GNUSTEP_USER_ROOT/Tools/sogod-0.9"
-elif [ -f $GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9 ]; then
+elif [ -x $GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9 ]; then
     sogod="$GNUSTEP_LOCAL_ROOT/Tools/sogod-0.9"
-elif [ -f $GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9 ]; then
+elif [ -x $GNUSTEP_LOCAL_ROOT/Tools/Admin/sogod-0.9 ]; then
+    sogod="$GNUSTEP_LOCAL_ROOT/Tools/Admin/sogod-0.9"
+elif [ -x $GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9 ]; then
     sogod="$GNUSTEP_SYSTEM_ROOT/Tools/sogod-0.9"
-elif [ -f $GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod-0.9 ]; then
+elif [ -x $GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod-0.9 ]; then
     sogod="$GNUSTEP_SYSTEM_ROOT/Tools/Admin/sogod-0.9"
 else
     echo "Can't find sogod-0.9"
     exit 1
 fi
 
-echo $$ > $PIDFILE
-
 startport=`defaults read sogod-0.9 WOPort`
 if [ "$?" == "0" ]
 then
@@ -70,4 +70,8 @@ else
   let "port=$startport + $1 - 1"
 fi
 
+echo "SOGOD: $sogod" 2>&1
+
 exec $sogod -WOPort $port >> /var/log/sogo/sogod-$port.log 2>&1 &
+echo $! > $PIDFILE
+