extras-buildsys/etc plague-builder.init, 1.7.2.2, 1.7.2.3 plague-server.init, 1.2.2.2, 1.2.2.3

[Daniel Williams (dcbw)]

Author: dcbw

Update of /cvs/fedora/extras-buildsys/etc
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17091/etc

Modified Files:
      Tag: STABLE_0_4
	plague-builder.init plague-server.init 
Log Message:
2006-03-12  Dan Williams  <dcbw at redhat.com>

    * builder/builder.py
        - Add a SIGTERM handler for clean shutdown
        - Clean up lifecycle management

    * common/HTTPServer.py
        - Clean up lifecycle management of PlgHTTPServerManager objects

    * common/SSLCommon.py
        - Clean up lifecycle management of PlgBaseServer objects
        - Initialize correct parent object in PlgBaseSSLServer.__init__

    * etc/plague-builder.init
      etc/plague-server.init
        - Cleanups

    * server/main.py
        - Add a SIGTERM handler for clean shutdown
        - Clean up lifecycle management




Index: plague-builder.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-builder.init,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- plague-builder.init	16 Feb 2006 06:14:46 -0000	1.7.2.2
+++ plague-builder.init	12 Mar 2006 05:53:05 -0000	1.7.2.3
@@ -13,30 +13,34 @@
 # Source function library.
 . /etc/init.d/functions
 
-prog="plague-builder"
+servicename="plague-builder"
+processname="plague-builder"
+pidfile=/var/run/plague-builder.pid
+logfile=/var/log/plague-builder.log
 
-if [ -f /etc/sysconfig/plague-builder ]; then
-. /etc/sysconfig/plague-builder
+if [ -f /etc/sysconfig/$servicename ]; then
+. /etc/sysconfig/$servicename
 fi
 
 start() {
-	if [ ! -f /var/lock/subsys/plague-builder ]; then
-	echo -n $"Starting $prog: "
-	daemon plague-builder -c $CONFIG -d -p /var/run/plague-builder.pid -l /var/log/plague-builder.log
-	echo
-	touch /var/lock/subsys/plague-builder
-	return 0
+	if [ ! -f /var/lock/subsys/$servicename ]; then
+		echo -n $"Starting $servicename: "
+		daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile
+		RETVAL=$?
+		echo
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
 	fi
 }	
 
 stop() {
-	if test "x`pidof -x plague-builder`" != x; then
-	echo -n $"Stopping $prog: "
-	killproc plague-builder
+	echo -n $"Stopping $servicename: "
+	killproc -p $pidfile $servicename
+	RETVAL=$?
 	echo
+	if [ $RETVAL -eq 0 ]; then
+		rm -f /var/lock/subsys/$servicename
+		rm -f $pidfile
 	fi
-	rm -f /var/lock/subsys/plague-builder
-	return 0
 }
 
 restart() {
@@ -45,25 +49,26 @@
 }
 
 case "$1" in
-    start)
-	start
-	;;
-    stop)
-	stop
-	;;
-    status)
-	status plague-builder
-	;;
-    restart)
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	status)
+		status -p $pidfile $processname
+		RETVAL=$?
+		;;
+	restart)
     	stop
-	start
-	;;
-    condrestart)
-	[ -f /var/lock/subsys/plague-builder ] && restart || :
-	;;
-    *)
-	echo "Usage: <servicename> {start|stop|status|reload|restart[|probe]"
-	exit 1
-	;;
+		start
+		;;
+	condrestart)
+		[ -f /var/lock/subsys/$servicename ] && restart || :
+		;;
+	*)
+		echo "Usage: $0 {start|stop|status|reload|restart[|probe]"
+		exit 1
+		;;
 esac
 exit $?


Index: plague-server.init
===================================================================
RCS file: /cvs/fedora/extras-buildsys/etc/plague-server.init,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -r1.2.2.2 -r1.2.2.3
--- plague-server.init	16 Feb 2006 06:14:46 -0000	1.2.2.2
+++ plague-server.init	12 Mar 2006 05:53:05 -0000	1.2.2.3
@@ -13,30 +13,34 @@
 # Source function library.
 . /etc/init.d/functions
 
-prog="plague-server"
+servicename="plague-server"
+processname="plague-server"
+pidfile=/var/run/plague-server.pid
+logfile=/var/log/plague-server.log
 
-if [ -f /etc/sysconfig/plague-server ]; then
-. /etc/sysconfig/plague-server
+if [ -f /etc/sysconfig/$servicename ]; then
+. /etc/sysconfig/$servicename
 fi
 
 start() {
-	if [ ! -f /var/lock/subsys/plague-server ]; then
-	echo -n $"Starting $prog: "
-	daemon plague-server -c $CONFIG -d -p /var/run/plague-server.pid -l /var/log/plague-server.log
-	echo
-	touch /var/lock/subsys/plague-server
-	return 0
+	if [ ! -f /var/lock/subsys/$servicename ]; then
+		echo -n $"Starting $servicename: "
+		daemon --check $servicename $processname -d -c $CONFIG -p $pidfile -l $logfile
+		RETVAL=$?
+		echo
+		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/$servicename
 	fi
 }	
 
 stop() {
-	if test "x`pidof -x plague-server`" != x; then
-	echo -n $"Stopping $prog: "
-	killproc plague-server
+	echo -n $"Stopping $servicename: "
+	killproc -p $pidfile $servicename
+	RETVAL=$?
 	echo
+	if [ $RETVAL -eq 0 ]; then
+		rm -f /var/lock/subsys/$servicename
+		rm -f $pidfile
 	fi
-	rm -f /var/lock/subsys/plague-server
-	return 0
 }
 
 restart() {
@@ -45,25 +49,26 @@
 }
 
 case "$1" in
-    start)
-	start
-	;;
-    stop)
-	stop
-	;;
-    status)
-	status plague-server
-	;;
-    restart)
-    	stop
-	start
-	;;
-    condrestart)
-	[ -f /var/lock/subsys/plague-server ] && restart || :
-	;;
-    *)
-	echo "Usage: <servicename> {start|stop|status|reload|restart[|probe]"
-	exit 1
-	;;
+	start)
+		start
+		;;
+	stop)
+		stop
+		;;
+	status)
+		status -p $pidfile $processname
+		RETVAL=$?
+		;;
+	restart)
+		stop
+		start
+		;;
+	condrestart)
+		[ -f /var/lock/subsys/$servicename ] && restart || :
+		;;
+	*)
+		echo "Usage: $0 {start|stop|status|reload|restart[|probe]"
+		exit 1
+		;;
 esac
 exit $?