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:   21-Jul-2003 12:02:32
  Branch: HEAD                             Handle: 2003072111023100

  Modified files:
    openpkg-src/smtpfeed    rc.smtpfeed

  Log:
    %status and pidfile handling

  Summary:
    Revision    Changes     Path
    1.18        +15 -5      openpkg-src/smtpfeed/rc.smtpfeed
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-src/smtpfeed/rc.smtpfeed
  ============================================================================
  $ cvs diff -u -r1.17 -r1.18 rc.smtpfeed
  --- openpkg-src/smtpfeed/rc.smtpfeed  21 Jul 2003 08:40:50 -0000      1.17
  +++ openpkg-src/smtpfeed/rc.smtpfeed  21 Jul 2003 10:02:31 -0000      1.18
  @@ -30,6 +30,9 @@
       smtpfeed_args="$smtpfeed_args -c ${smtpfeed_hostname:-localhost}"
       smtpfeed_args="$smtpfeed_args -r 1 -R ${smtpfeed_maxrcpt:-100}"
       smtpfeed_args="$smtpfeed_args -s ${smtpfeed_maxsize:-4194304}"
  +    smtpfeed_signal () {
  +        [ -f $smtpfeed_pidfile ] && kill -TERM `cat $smtpfeed_pidfile`
  +    }
       smtpfeed_start () {
           ( @l_prefix@/sbin/smtpfeedd ${smtpfeed_bind_local:-127.0.0.1:2525} \
             @l_prefix@/sbin/smtpfeed ${smtpfeed_args} \
  @@ -38,12 +41,19 @@
           ) </dev/null >/dev/null 2>&1
       }
       smtpfeed_stop () {
  -        if [ -f ${smtpfeed_pidfile} ]; then
  -            kill -TERM `cat ${smtpfeed_pidfile}`
  -            sleep 1
  -        fi
  +        smtpfeed_signal TERM
  +        rm -f $smtpfeed_pidfile 2>/dev/null || true
       }
   
  +%status -p 200 -u @l_susr@ -o
  +    smtpfeed_usable="unknown"
  +    smtpfeed_active="no"
  +    rcService smtpfeed enable yes && \
  +        smtpfeed_signal 0 && smtpfeed_active="yes"
  +    echo "smtpfeed_enable=\"$smtpfeed_enable\""
  +    echo "smtpfeed_usable=\"$smtpfeed_usable\""
  +    echo "smtpfeed_active=\"$smtpfeed_active\""
  +
   %start -p 200 -u @l_susr@
       rcService smtpfeed enable yes || exit 0
       smtpfeed_start
  @@ -55,7 +65,7 @@
   %restart -u @l_susr@
       rcService smtpfeed enable yes || exit 0
       smtpfeed_stop
  -    sleep 1
  +    sleep 2
       smtpfeed_start
   
   %daily -u @l_susr@
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [EMAIL PROTECTED]

Reply via email to