Changeset 431

Timestamp:

07/08/07 22:58:56 (17 years ago)

Author:

bastiaans

Message:

Makefile:

• updated rpm-jobmond

jobmond/jobmond.py:

• fix to pidfile arg parsing
• fix to native gmetric unit handling

pkg/rpm/init.d/jobmond:

• updated as a proper redhat based init script

pkg/rpm/jobmonarch-jobmond.spec:

• call chkconfig in preun not postun

Location:

trunk

Files:

• Makefile (modified) (1 diff)
• jobmond/jobmond.py (modified) (4 diffs)
• pkg/rpm/init.d/jobmond (modified) (1 diff)
• pkg/rpm/jobmonarch-jobmond.spec (modified) (2 diffs)

trunk/Makefile

@@ -86 +86 @@
 rpm-jobmond:    ${REQUIRED}
         mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/etc/init.d >/dev/null
-        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/usr/bin >/dev/null
-        install -m 755 jobmond/jobmond.py ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/usr/bin
-        ( cd ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/usr/bin; \
+        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/etc/sysconfig >/dev/null
+        mkdir -p ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/usr/sbin >/dev/null
+        install -m 755 jobmond/jobmond.py ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/usr/sbin
+        ( cd ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/usr/sbin; \
         ln -s jobmond.py jobmond || true)
         install jobmond/jobmond.conf ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/etc
-        install pkg/init.d/jobmond ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/etc/init.d
+        install pkg/rpm/init.d/jobmond ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/etc/init.d
+        install pkg/rpm/sysconfig/jobmond ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/etc/sysconfig
         cp pkg/rpm/jobmonarch-jobmond.spec \
         ${TMPDIR}/.monarch_buildroot/jobmonarch-jobmond-${VERSION}-${RELEASE}/jobmonarch-jobmond-${VERSION}-${RELEASE}.spec

trunk/jobmond/jobmond.py

@@ -42 +42 @@
 def processArgs( args ):
 
-        SHORT_L         = 'hc:'
-        LONG_L          = [ 'help', 'config=' ]
+        SHORT_L         = 'p:hc:'
+        LONG_L          = [ 'help', 'config=', 'pidfile=' ]
 
         global PIDFILE
@@ -894 +894 @@
 GMETRIC_DEFAULT_HOST    = '127.0.0.1'
 GMETRIC_DEFAULT_PORT    = '8649'
+GMETRIC_DEFAULT_UNITS   = ''
 
 class Gmetric:
@@ -920 +921 @@
 
                 self.hostport   = ( host, int( port ) )
-                self.type       = GMETRIC_DEFAULT_TYPE
-                self.unitstr    = ''
                 self.slopestr   = 'both'
                 self.tmax       = 60
@@ -938 +937 @@
                         return 'udp'
 
-        def send( self, name, value, dmax, type = '', units = '' ):
+        def send( self, name, value, dmax, typestr = '', units = '' ):
 
                 if len( units ) == 0:
-                        units           = self.unitstr
-                if len( type ) == 0:
-                        typestr         = self.type
+                        units           = GMETRIC_DEFAULT_UNITS
+                if len( typestr ) == 0:
+                        typestr         = GMETRIC_DEFAULT_TYPE
 
                 msg             = self.makexdr( name, value, typestr, units, self.slopestr, self.tmax, dmax )

trunk/pkg/rpm/init.d/jobmond

@@ -1 @@
-#! /bin/sh
+#!/bin/sh
+#
+# Init file for the Job Monitoring Daemon
+#
+# chkconfig: 2345 20 80
+# description: jobmond reports information on batch jobs as Ganglia metrics
+#
+# processname: jobmond
+# config: /etc/jobmond.conf
+# config: /etc/sysconfig/jobmond
+# pidfile: /var/run/jobmond
 
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-DAEMON=/usr/bin/jobmond
-NAME=jobmond
-DESC="Job Monitor Daemon"
+# Source function library.
+. /etc/rc.d/init.d/functions
 
-test -x $DAEMON || exit 0
+RETVAL=0
+name=jobmond
+prog=/usr/sbin/jobmond
+desc="Job Monitoring Daemon"
 
-set -e
+if [ -r /etc/sysconfig/$name ]; then
+        source /etc/sysconfig/$name
+fi
+
+start() {
+        echo -n $"Starting $desc: "
+        daemon $prog $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 
-        echo "$NAME."
-        ;;
-  stop)
-        echo -n "Stopping $DESC: "
-        start-stop-daemon --stop  --quiet --oknodo --name $DAEMON \
-                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-jobmond.spec

@@ -31 +31 @@
 
 /etc/init.d/jobmond stop
-
-
-%postun
-#!/bin/sh
-
-PATH=/bin:/sbin:/usr/bin:/usr/sbin
-
 chkconfig jobmond off
 
@@ -48 +41 @@
 %files
 "/etc/init.d/jobmond"
-"/usr/bin/jobmond.py"
-"/usr/bin/jobmond"
+%config "/etc/sysconfig/jobmond"
+"/usr/sbin/jobmond.py"
+"/usr/sbin/jobmond"
 %config "/etc/jobmond.conf"