Changeset 435 for trunk/pkg/rpm

Timestamp:

07/11/07 16:57:42 (16 years ago)

Author:

bastiaans

Message:

jobarchived/jobarchived.py:

• added pidfile support

pkg/rpm/init.d/jobarchived,
pkg/rpm/jobmonarch-jobarchived.spec,
Makefile:

• updated

Location:

trunk/pkg/rpm

Files:

• init.d/jobarchived (modified) (1 diff)
• jobmonarch-jobarchived.spec (modified) (2 diffs)

trunk/pkg/rpm/init.d/jobarchived

@@ -1 @@
-#! /bin/sh
+#!/bin/sh
+#
+# Init file for the Job Archiving Daemon
+#
+# chkconfig: 2345 20 80
+# description: jobarchived archives information on nodes in RRDS and batch jobs in SQL
+#
+# processname: jobarchived
+# config: /etc/jobarchived.conf
+# config: /etc/sysconfig/jobarchived
+# pidfile: /var/run/jobarchived
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/jobarchived
-NAME=jobarchived
-DESC="Job Archive Daemon"
+# Source function library.
+. /etc/rc.d/init.d/functions
 
-export PYTHONPATH=/usr/share/jobarchived:$PYTHONPATH
+RETVAL=0
+name=jobarchived
+prog=/usr/sbin/jobarchived
+desc="Job Archiving Daemon"
 
-test -x $DAEMON || exit 0
+if [ -r /etc/sysconfig/$name ]; then
+        source /etc/sysconfig/$name
+fi
 
-set -e
+start() {
+        echo -n $"Starting $desc: "
+        daemon $prog -p /var/run/$name.pid $OPTIONS
+        RETVAL=$?
+        echo
+        [ $RETVAL -eq 0 ] && touch /var/lock/subsys/$name
+        return $RETVAL
+}
+
+stop() {
+        echo -n $"Stopping $desc: "
+        killproc $prog
+        RETVAL=$?
+        echo
+        [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$name
+        return $RETVAL
+}
+
+restart() {
+        stop
+        start
+}
 
 case "$1" in
-  start)
-        echo -n "Starting $DESC: "
-        start-stop-daemon --start --quiet -m --pidfile /var/run/$NAME.pid \
-                --exec $DAEMON 
-        sleep 1
-        ps -ef | grep jobarchived$ | awk '{ print $2 }' >/var/run/$NAME.pid
-        echo "$NAME."
-        ;;
-  stop)
-        echo -n "Stopping $DESC: "
-        start-stop-daemon --stop  --quiet --oknodo --name $DAEMON \
-                2>&1 > /dev/null
-        sleep 1
-        test -f /var/run/$NAME.pid && MYPID=`cat /var/run/$NAME.pid`
-        test ! -z $MYPID && ps $MYPID 2>&1 > /dev/null && kill -9 $MYPID 2>&1 > /dev/null
-        echo "$NAME."
-        ;;
-  restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-  *)
-        echo "Usage: $N {start|stop|restart}" >&2
-        exit 1
-        ;;
+        start)
+                start
+                ;;
+        stop)
+                stop
+                ;;
+        restart)
+                restart
+                ;;
+        condrestart)
+                [ -e /var/lock/subsys/$name ] && restart
+                RETVAL=$?
+                ;;
+        status)
+                status python
+                RETVAL=$?
+                ;;
+        *)
+                echo $"Usage: $0 {start|stop|restart|condrestart|status}"
+                RETVAL=1
 esac
 
-exit 0
+exit $RETVAL

trunk/pkg/rpm/jobmonarch-jobarchived.spec

@@ -40 +40 @@
 
 /etc/init.d/jobarchived stop
-
-
-%postun
-#!/bin/sh
-
-PATH=/bin:/sbin:/usr/bin:/usr/sbin
-
 chkconfig jobarchived off
 
@@ -56 +49 @@
 
 %files
-"/usr/bin/jobarchived.py"
+"/usr/sbin/jobarchived.py"
+"/usr/sbin/jobarchived"
 "/etc/init.d/jobarchived"
-"/etc/jobarchived.conf"
-"/usr/bin/jobarchived"
+%config "/etc/jobarchived.conf"
+%config "/etc/sysconfig/jobarchived"
 %dir "/usr/share/jobarchived/"
 "/usr/share/jobarchived/job_dbase.sql"