OF-581 Process management improvements

git-svn-id: http://svn.igniterealtime.org/svn/repos/openfire/trunk@13330 b35dd754-fafc-0310-a699-88a17e54d16e

src/bin/extra/redhat/openfire

@@ -22,10 +22,17 @@ PATH="/sbin:/bin:/usr/bin:/usr/sbin"
 RETVAL=0
 
 # Check that we are root ... so non-root users stop here.
-[ "`id -u`" = 0 ] || exit 1
+if [ "`id -u`" != 0 ]; then
+	echo $0 must be run as root
+	exit 1
+fi
 
 # Get config.
 [ -f "/etc/sysconfig/openfire" ] && . /etc/sysconfig/openfire
+if [ -f "/etc/init.d/functions" ]; then
+  FUNCTIONS_FOUND=true
+  . /etc/init.d/functions
+fi
 
 # If openfire user is not set in sysconfig, set to daemon.
 [ -z "$OPENFIRE_USER" ] && OPENFIRE_USER="daemon"
@@ -107,10 +114,9 @@ start() {
 	OLD_PWD=`pwd`
 	cd $OPENFIRE_LOGDIR
 
-    # Check if the server is already running. We look only for the pid file
-    pid=`cat $OPENFIRE_PIDFILE 2>&1`                                       
-    if [ "$?" = "0" ]; then                                                
-        echo "Openfire is already running. Remove $OPENFIRE_PIDFILE if you know this to be untrue."                                 
+	PID=$(findPID)
+	if [ -n "$PID" ]; then                                                
+	    echo "Openfire is already running."                                 
 	    RETVAL=1                                                           
 	    return                                                             
 	fi                                                                     
@@ -121,11 +127,6 @@ start() {
 	rm -f nohup.out
 	su -s /bin/sh -c "nohup $OPENFIRE_RUN_CMD > $OPENFIRE_LOGDIR/nohup.out 2>&1 &" $OPENFIRE_USER
 	RETVAL=$?
-	PID=`ps ax --width=1000 | grep openfire | grep startup.jar | awk '{print $1}'`
-
-	if [ $RETVAL -eq 0 -a ! -z "$PID" -a ! -z "$OPENFIRE_PIDFILE" ]; then
-		echo $PID > $OPENFIRE_PIDFILE
-	fi
 
 	echo
 
@@ -139,11 +140,23 @@ stop() {
 	# Stop daemons.
 	echo -n "Shutting down openfire: "
 
-	[ -f "$OPENFIRE_PIDFILE" ] && kill `cat $OPENFIRE_PIDFILE`
+	PID=$(findPID)
+	if [ -n "$PID" ]; then
+		if [ -n "$FUNCTIONS_FOUND" ]; then
+			echo $PID > $OPENFIRE_PIDFILE
+			# delay copied from restart
+			killproc -p $OPENFIRE_PIDFILE -d 10
+			rm -f $OPENFIRE_PIDFILE
+		else
+			kill $PID
+		fi
+	else
+		echo "Openfire is not running."
+	fi
+	
 	RETVAL=$?
 	echo
 
-	[ $RETVAL -eq 0 -a -f "$OPENFIRE_PIDFILE" ] && rm -f $OPENFIRE_PIDFILE
 	[ $RETVAL -eq 0 -a -f "/var/lock/subsys/openfire" ] && rm -f /var/lock/subsys/openfire
 }
 
@@ -159,22 +172,19 @@ condrestart() {
 }
 
 status() {
-	pid=`cat $OPENFIRE_PIDFILE 2>&1`
-	if [ "$?" = "1" ]; then
-		echo "openfire is not running"
-		RETVAL=3
-	else 
-		ps -p $pid > /dev/null 2>&1
-		if [ "$?" = "0" ]; then 
+	PID=$(findPID)
+	if [ -n "$PID" ]; then
 		echo "openfire is running"
 		RETVAL=0
 	else 
 		echo "openfire is not running"
 		RETVAL=1
 	fi
-	fi
 }
 
+findPID() {
+	echo `ps ax --width=1000 | grep openfire | grep startup.jar | awk '{print $1}'`
+}
 
 # Handle how we were called.
 case "$1" in