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:02:28
Branch: HEAD Handle: 2003072216022800
Modified files:
openpkg-src/dss rc.dss
Log:
%status and pidfile handling
Summary:
Revision Changes Path
1.12 +36 -25 openpkg-src/dss/rc.dss
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/dss/rc.dss
============================================================================
$ cvs diff -u -r1.11 -r1.12 rc.dss
--- openpkg-src/dss/rc.dss 22 Jul 2003 08:10:46 -0000 1.11
+++ openpkg-src/dss/rc.dss 22 Jul 2003 15:02:28 -0000 1.12
@@ -7,40 +7,51 @@
dss_enable="$openpkg_rc_def"
dss_admin="no"
+%common
+ dss_daemon_pidfile="@l_prefix@/var/dss/dssdaemon.pid"
+ dss_admin_pidfile="@l_prefix@/var/dss/dssadmin.pid"
+ dss_signal () {
+ [ -f $dss_daemon_pidfile ] \
+ && kill -$1 `cat $dss_daemon_pidfile`
+ local rc=$?
+ if rcVarIsYes dss_admin; then
+ [ -f $dss_admin_pidfile ] \
+ && kill -$1 `cat $dss_admin_pidfile` \
+ && [ $rc -eq 0 ]
+ rc=$?
+ fi
+ [ $rc -eq 0 ]
+ }
+
+%status -u @l_susr@ -o
+ dss_usable="unknown"
+ dss_active="no"
+ rcService dss enable yes && \
+ dss_signal 0 && dss_active="yes"
+ echo "dss_enable=\"$dss_enable\""
+ echo "dss_usable=\"$dss_usable\""
+ echo "dss_active=\"$dss_active\""
+
%start -u @l_susr@
rcService dss enable yes || exit 0
@l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 &
- echo $! >@l_prefix@/var/dss/dssdaemon.pid
+ echo $! >$dss_daemon_pidfile
if rcVarIsYes dss_admin; then
- @l_prefix@/sbin/streamingadminserver -c
@l_prefix@/etc/dss/streamingadmin.conf
+ @l_prefix@/sbin/streamingadminserver \
+ -c @l_prefix@/etc/dss/streamingadmin.conf \
+ >/dev/null 2>&1 &
+ echo $! >$dss_admin_pidfile
fi
%stop -u @l_susr@
rcService dss enable yes || exit 0
- if [ -f @l_prefix@/var/dss/dssdaemon.pid ]; then
- kill -TERM `cat @l_prefix@/var/dss/dssdaemon.pid`
- rm @l_prefix@/var/dss/dssdaemon.pid
- fi
- if rcVarIsYes dss_admin; then
- if [ -f @l_prefix@/var/dss/dssadmin.pid ]; then
- kill -TERM `cat @l_prefix@/var/dss/dssadmin.pid`
- rm @l_prefix@/var/dss/dssadmin.pid
- fi
- fi
+ dss_signal TERM
+ rm -f $dss_daemon_pidfile 2>/dev/null || true
+ rm -f $dss_admin_pidfile 2>/dev/null || true
%restart -u @l_susr@
rcService dss enable yes || exit 0
- if [ -f @l_prefix@/var/dss/dssdaemon.pid ]; then
- kill -TERM `cat @l_prefix@/var/dss/dssdaemon.pid`
- rm @l_prefix@/var/dss/dssdaemon.pid
- fi
- @l_prefix@/sbin/DarwinStreamingServer -d >/dev/null 2>&1 &
- echo $! >@l_prefix@/var/dss/dssdaemon.pid
- if rcVarIsYes dss_admin; then
- if [ -f @l_prefix@/var/dss/dssadmin.pid ]; then
- kill -TERM `cat @l_prefix@/var/dss/dssadmin.pid`
- rm @l_prefix@/var/dss/dssadmin.pid
- fi
- @l_prefix@/sbin/streamingadminserver -c
@l_prefix@/etc/dss/streamingadmin.conf
- fi
+ rc dss stop
+ sleep 2
+ rc dss start
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
