%status and pidfile handling

mico/mico.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [PLUS]
 Group:        System
 License:      LGPL/GPL
 Version:      2.3.10
-Release:      20030719
+Release:      20030721
 
 #   package options
 %option       with_ssl      no

mico/rc.mico

@@ -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