OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Michael van Elst
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 22-Jul-2003 17:01:02
Branch: HEAD Handle: 2003072216010100
Modified files:
openpkg-src/sysmon rc.sysmon sysmon.spec
Log:
%status and pidfile handling
Summary:
Revision Changes Path
1.12 +26 -9 openpkg-src/sysmon/rc.sysmon
1.36 +4 -0 openpkg-src/sysmon/sysmon.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/sysmon/rc.sysmon
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.sysmon
--- openpkg-src/sysmon/rc.sysmon 22 Jul 2003 08:11:13 -0000 1.11
+++ openpkg-src/sysmon/rc.sysmon 22 Jul 2003 15:01:01 -0000 1.12
@@ -10,23 +10,40 @@
sysmon_log_numfiles="10"
sysmon_log_minsize="1M"
sysmon_log_complevel="9"
+ sysmon_stop_timeout="60"
%common
- sysmon_pidfile="@l_prefix@/var/sysmon/sysmon.pid"
+ sysmon_pidfile="@l_prefix@/var/sysmon/sysmond.pid"
+ sysmon_signal () {
+ [ -f $sysmon_pidfile ] && kill -$1 `cat $sysmon_pidfile`
+ }
+
+%status -u @l_susr@ -o
+ sysmon_usable="unknown"
+ sysmon_active="no"
+ rcService sysmon enable yes && \
+ sysmon_signal 0 && sysmon_active="yes"
+ echo "sysmon_enable=\"$sysmon_enable\""
+ echo "sysmon_usable=\"$sysmon_usable\""
+ echo "sysmon_active=\"$sysmon_active\""
%start -u @l_susr@
rcService sysmon enable yes || exit 0
- rcTmp -i -p sysmon
- logfile=`rcTmp -f -n log`
- @l_prefix@/sbin/sysmond -q -f @l_prefix@/etc/sysmon/sysmon.conf >$logfile 2>&1
- grep "pid" $logfile | sed -e 's;^.*pid \([0-9]*\).*$;\1;' >$sysmon_pidfile
- rcTmp -k
+ @l_prefix@/sbin/sysmond -q -f @l_prefix@/etc/sysmon/sysmon.conf >/dev/null 2>&1
%stop -u @l_susr@
rcService sysmon enable yes || exit 0
- if [ -f $sysmon_pidfile ]; then
- kill -TERM `cat $sysmon_pidfile`
- fi
+ sysmon_signal TERM
+
+%restart -u @l_susr@
+ rcService sysmon enable yes || exit 0
+ rc sysmon stop
+ sleep 2
+ rc sysmon start
+
+%reload -u @l_susr@
+ rcService sysmon enable yes || exit 0
+ sysmon_signal HUP
%daily -u @l_susr@
rcService sysmon enable yes || exit 0
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/sysmon/sysmon.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 sysmon.spec
--- openpkg-src/sysmon/sysmon.spec 22 Jul 2003 08:11:13 -0000 1.35
+++ openpkg-src/sysmon/sysmon.spec 22 Jul 2003 15:01:01 -0000 1.36
@@ -67,6 +67,10 @@
%setup -q
%build
+ # force pidfile path
+ %{l_shtool} subst \
+ -e 's;\(#define PIDFILE\).*;\1 "%{l_prefix}/var/sysmon/sysmond.pid";' \
+ src/config.h
# force use of ncurses
echo "ac_cv_lib_curses_refresh=no" >config.cache
CC="%{l_cc}" \
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
