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 openpkg-web Date: 21-Jul-2003 17:41:24
Branch: HEAD Handle: 2003072116412202
Modified files:
openpkg-src/mico mico.spec rc.mico
openpkg-web news.txt
Log:
%status and pidfile handling
Summary:
Revision Changes Path
1.36 +1 -1 openpkg-src/mico/mico.spec
1.10 +40 -35 openpkg-src/mico/rc.mico
1.5695 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/mico/mico.spec
============================================================================
$ cvs diff -u -r1.35 -r1.36 mico.spec
--- openpkg-src/mico/mico.spec 19 Jul 2003 17:06:05 -0000 1.35
+++ openpkg-src/mico/mico.spec 21 Jul 2003 15:41:24 -0000 1.36
@@ -33,7 +33,7 @@
Group: System
License: LGPL/GPL
Version: 2.3.10
-Release: 20030719
+Release: 20030721
# package options
%option with_ssl no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/mico/rc.mico
============================================================================
$ cvs diff -u -r1.9 -r1.10 rc.mico
--- openpkg-src/mico/rc.mico 19 Jul 2003 17:06:05 -0000 1.9
+++ openpkg-src/mico/rc.mico 21 Jul 2003 15:41:24 -0000 1.10
@@ -10,52 +10,57 @@
mico_nsd_args="-ORBGIOPVersion 1.2 -ORBIIOPVersion 1.2 -ORBIIOPAddr inet:`uname
-n`:8914"
mico_micod_args="-ORBGIOPVersion 1.2 -ORBIIOPVersion 1.2 -ORBIIOPAddr
inet:`uname -n`:8912"
-%start -p 200 -u @l_musr@
+%common
+ mico_micod_pidfile="@l_prefix@/var/mico/micod.pid"
+ mico_nsd_pidfile="@l_prefix@/var/mico/nsd.pid"
+ mico_signal () {
+ local rc_micod=0
+ local rc_nsd=0
+ if rcVarIsYes mico_micod; then
+ [ -f $mico_micod_pidfile ] \
+ && kill -$1 `cat $mico_micod_pidfile`
+ rc_micod=$?
+ fi
+ if rcVarIsYes mico_nsd; then
+ [ -f $mico_nsd_pidfile ] \
+ && kill -$1 `cat $mico_nsd_pidfile`
+ rc_nsd=$?
+ fi
+ [ $rc_micod -eq 0 -a $rc_nsd -eq 0 ]
+ }
+
+%status -p 200 -u @l_susr@ -o
+ mico_usable="unknown"
+ mico_active="no"
+ rcService mico enable yes && \
+ ( rcVarIsYes mico_micod || rcVarIsYes mico_nsd ) && \
+ mico_signal 0 && mico_active="yes"
+ echo "mico_enable=\"$mico_enable\""
+ echo "mico_usable=\"$mico_usable\""
+ echo "mico_active=\"$mico_active\""
+
+%start -p 200 -u @l_rusr@
rcService mico enable yes || exit 0
# run the object adapter daemon for dynamic object activation
if rcVarIsYes mico_micod; then
@l_prefix@/bin/micod ${mico_micod_args} &
- echo $! >@l_prefix@/var/mico/micod.pid
+ echo $! >$mico_micod_pidfile
fi
# run the name service daemon for flexible object indexing
if rcVarIsYes mico_nsd; then
@l_prefix@/bin/nsd ${mico_nsd_args} &
- echo $! >@l_prefix@/var/mico/nsd.pid
+ echo $! >$mico_nsd_pidfile
fi
-%stop -p 200 -u @l_musr@
+%stop -p 200 -u @l_rusr@
rcService mico enable yes || exit 0
- if rcVarIsYes mico_micod; then
- # first test if object adapter daemon is running
- if [ -f @l_prefix@/var/mico/micod.pid ]; then
- kill -TERM `cat @l_prefix@/var/mico/micod.pid`
- rm @l_prefix@/var/mico/micod.pid
- fi
- fi
- if rcVarIsYes mico_nsd; then
- # first test if name service daemon is running
- if [ -f @l_prefix@/var/mico/nsd.pid ]; then
- kill -TERM `cat @l_prefix@/var/mico/nsd.pid`
- rm @l_prefix@/var/mico/nsd.pid
- fi
- fi
+ mico_signal TERM
+ rm -f $mcio_micod_pidfile 2>/dev/null || true
+ rm -f $mcio_nsd_pidfile 2>/dev/null || true
-%restart -u @l_musr@
+%restart -u @l_rusr@
rcService mico enable yes || exit 0
- # first test if object adapter daemon is running
- if [ -f @l_prefix@/var/mico/micod.pid ]; then
- kill -TERM `cat @l_prefix@/var/mico/micod.pid`
- sleep 2
- fi
- # run the object adapter daemon for dynamic object activation
- @l_prefix@/bin/micod ${mico_micod_args} &
- echo $! >@l_prefix@/var/mico/micod.pid
- # first test if name service daemon is running
- if [ -f @l_prefix@/var/mico/nsd.pid ]; then
- kill -TERM `cat @l_prefix@/var/mico/nsd.pid`
- sleep 2
- fi
- # run the name service daemon for flexible object indexing
- @l_prefix@/bin/nsd ${mico_nsd_args} &
- echo $! >@l_prefix@/var/mico/nsd.pid
+ rc mico stop
+ sleep 2
+ rc mico start
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.5694 -r1.5695 news.txt
--- openpkg-web/news.txt 21 Jul 2003 15:18:50 -0000 1.5694
+++ openpkg-web/news.txt 21 Jul 2003 15:41:22 -0000 1.5695
@@ -1,3 +1,4 @@
+21-Jul-2003: Upgraded package: P<mico-2.3.10-20030721>
21-Jul-2003: Upgraded package: P<dcron-2.9-20030721>
21-Jul-2003: Upgraded package: P<pgp-6.5.8-20030721>
21-Jul-2003: Upgraded package: P<perl-www-20030721-20030721>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
