SOURCES: openfire.init - java does not know how to create pidfile, so we ha...

[pawelz]

Author: pawelz                       Date: Mon Mar  9 09:11:53 2009 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- java does not know how to create pidfile, so we have to use
  start-stop-daemon -m

---- Files affected:
SOURCES:
   openfire.init (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: SOURCES/openfire.init
diff -u SOURCES/openfire.init:1.2 SOURCES/openfire.init:1.3
--- SOURCES/openfire.init:1.2	Sun Mar  8 15:24:44 2009
+++ SOURCES/openfire.init	Mon Mar  9 10:11:47 2009
@@ -95,7 +95,8 @@
 export JAVA_HOME JAVACMD
 
 # Lastly, prepare the full command that we are going to run.
-OPENFIRE_RUN_CMD="${JAVACMD} -server ${OPENFIRE_OPTS} -classpath \"${LOCALCLASSPATH}\" -jar \"${OPENFIRE_LIB}/startup.jar\""
+# OPENFIRE_RUN_CMD="${JAVACMD} -server ${OPENFIRE_OPTS} -classpath \"${LOCALCLASSPATH}\" -jar \"${OPENFIRE_LIB}/startup.jar\""
+JAVA_ARGS="-server ${OPENFIRE_OPTS} -classpath ${LOCALCLASSPATH} -jar ${OPENFIRE_LIB}/startup.jar"
 
 #####
 # End setup work
@@ -107,9 +108,17 @@
 	# Check if the service is already running?
 	if [ ! -f /var/lock/subsys/openfire ]; then
 		msg_starting openfire
-		daemon --fork --user $OPENFIRE_USER $OPENFIRE_RUN_CMD 
+		/sbin/start-stop-daemon -S --pidfile $OPENFIRE_PIDFILE -m -b --user $OPENFIRE_USER -x $JAVACMD -- $JAVA_ARGS
 		RETVAL=$?
-		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/openfire
+		if [ $RETVAL -eq 0 ]; then
+		       	touch /var/lock/subsys/openfire
+			log_success "openfire startup"
+			ok
+		else
+			log_fail "openfire startup"
+			fail
+		fi
+
 	else
 		msg_already_running openfire
 	fi
@@ -119,7 +128,8 @@
         # Stop daemons.
         if [ -f /var/lock/subsys/openfire ]; then
                 msg_stopping openfire
-		killproc openfire
+		# /sbin/start-stop-daemon -K -R 5 --pidfile $OPENFIRE_PIDFILE openfire
+		killproc --pidfile $OPENFIRE_PIDFILE openfire
                 RETVAL=$?
                 rm -f /var/lock/subsys/openfire
         else
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/openfire.init?r1=1.2&r2=1.3&f=u