فهرست منبع

%status and pidfile handling

Michael van Elst 22 سال پیش
والد
کامیت
4b6ca91949
2فایلهای تغییر یافته به همراه21 افزوده شده و 10 حذف شده
  1. 1 1
      qpopper/qpopper.spec
  2. 20 9
      qpopper/rc.qpopper

+ 1 - 1
qpopper/qpopper.spec

@@ -33,7 +33,7 @@ Distribution: OpenPKG [BASE]
 Group:        Mail
 License:      GPL
 Version:      4.0.5
-Release:      20030717
+Release:      20030718
 
 #   package options
 %option       with_fsl  yes

+ 20 - 9
qpopper/rc.qpopper

@@ -14,24 +14,35 @@
     POP_type="qpopper"
     POP_logfile="@l_prefix@/var/qpopper/qpopper.log"
 
+%common
+    qpopper_pidfile="@l_prefix@/var/qpopper/qpopper.pid"
+    qpopper_signal () {
+        [ -f $qpopper_pidfile ] && kill -$1 `cat $qpopper_pidfile`
+    }
+
+%status -p 200 -u @l_susr@ -o
+    qpopper_usable="unknown"
+    qpopper_active="no"
+    opService qpopper enable yes && \
+        qpopper_signal 0 && qpopper_active="yes"
+    echo "qpopper_enable=\"$qpopper_enable\""
+    echo "qpopper_usable=\"$qpopper_usable\""
+    echo "qpopper_active=\"$qpopper_active\""
+
 %start -p 200 -u @l_susr@
     opService qpopper enable yes || exit 0
     @l_prefix@/sbin/qpopper ${qpopper_bind} -S -f @l_prefix@/etc/qpopper/qpopper.config
 
 %stop -p 200 -u @l_susr@
     opService qpopper enable yes || exit 0
-    if [ -f @l_prefix@/var/qpopper/qpopper.pid ]; then
-        kill -TERM `cat @l_prefix@/var/qpopper/qpopper.pid`
-        rm -f @l_prefix@/var/qpopper/qpopper.pid >/dev/null 2>&1 || true
-    fi
+    qpopper_signal TERM
+    rm -f $qpopper_pidfile >/dev/null 2>&1 || true
 
 %restart -u @l_susr@
     opService qpopper enable yes || exit 0
-    if [ -f @l_prefix@/var/qpopper/qpopper.pid ]; then
-        kill -TERM `cat @l_prefix@/var/qpopper/qpopper.pid`
-        rm -f @l_prefix@/var/qpopper/qpopper.pid >/dev/null 2>&1 || true
-        sleep 2
-    fi
+    qopper_signal TERM
+    rm -f $qpopper_pidfile >/dev/null 2>&1 || true
+    sleep 2
     @l_prefix@/sbin/qpopper ${qpopper_bind} -S -f @l_prefix@/etc/qpopper/qpopper.config
 
 %daily -u @l_susr@