mirror of
https://github.com/MailScanner/v5.git
synced 2024-09-20 15:26:08 +08:00
parent
5e202f6d2c
commit
e4f57fccca
|
@ -1,7 +1,7 @@
|
|||
11/07/2016 Changes in v5.0.4-1
|
||||
==================================
|
||||
- support for Postfix long queue IDs
|
||||
- updated install scripts
|
||||
- updated RHEL/Debian/SuSE install scripts
|
||||
- updated cron job scripts
|
||||
- updated init script
|
||||
- changed Debian upstart from 80/20 to 80/80
|
||||
|
|
|
@ -201,7 +201,7 @@ do_stop()
|
|||
if [ "x$PID" = "x" ]; then
|
||||
RETVAL=9
|
||||
else
|
||||
ps wwp $PID|grep -q [M]ailScanner: > /dev/null 2>&1
|
||||
ps wwp $PID|grep -q '[M]ailScanner': > /dev/null 2>&1
|
||||
RETVAL="$?"
|
||||
fi
|
||||
|
||||
|
@ -237,7 +237,12 @@ do_stop()
|
|||
# MailScanner is not running
|
||||
|
||||
# kill any rogue processes
|
||||
kill $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
|
||||
kill $(ps axww | grep '[M]ailScanner': | awk '{print $1}') > /dev/null 2>&1
|
||||
|
||||
# wait until they're gone.
|
||||
while (ps axww | grep -q '[M]ailScanner'); do
|
||||
sleep 1
|
||||
done
|
||||
|
||||
# these should not exist if the process is stopped, so they
|
||||
# are removed if they do exist
|
||||
|
@ -309,7 +314,7 @@ case "$1" in
|
|||
PID=$(head -n 1 $PIDFILE)
|
||||
|
||||
# check to see if running and belongs to mailscanner
|
||||
ps wwp $PID|grep -q [M]ailScanner: > /dev/null 2>&1
|
||||
ps wwp $PID|grep -q '[M]ailScanner': > /dev/null 2>&1
|
||||
|
||||
# get the return
|
||||
RETVAL="$?"
|
||||
|
@ -320,7 +325,11 @@ case "$1" in
|
|||
exit 0
|
||||
else
|
||||
[ "$VERBOSE" != no ] && logger -i -p mail.notice "Found a dead PID. Stopping all $NAME rogue processes ..."
|
||||
kill -15 $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
|
||||
kill -15 $(ps axww | grep '[M]ailScanner': | awk '{print $1}') > /dev/null 2>&1
|
||||
# wait until they're gone.
|
||||
while (ps axww | grep -q '[M]ailScanner'); do
|
||||
sleep 1
|
||||
done
|
||||
rm -f $PIDFILE
|
||||
fi
|
||||
fi
|
||||
|
@ -365,7 +374,7 @@ case "$1" in
|
|||
echo "$NAME started with process id $PID"
|
||||
else
|
||||
logger -i -p mail.notice "$NAME failed to start"
|
||||
kill -15 $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
|
||||
kill -15 $(ps axww | grep '[M]ailScanner': | awk '{print $1}') > /dev/null 2>&1
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
@ -429,7 +438,7 @@ case "$1" in
|
|||
PID=$(head -n 1 $PIDFILE)
|
||||
|
||||
# check to see if running and belongs to mailscanner
|
||||
ps wwp $PID|grep -q [M]ailScanner: > /dev/null 2>&1
|
||||
ps wwp $PID|grep -q '[M]ailScanner': > /dev/null 2>&1
|
||||
|
||||
# get the return
|
||||
RETVAL="$?"
|
||||
|
@ -441,7 +450,11 @@ case "$1" in
|
|||
else
|
||||
[ "$VERBOSE" != no ] && logger -i -p mail.notice "Found a dead PID. Killing all $NAME rogue processes ..."
|
||||
echo "$NAME had a dead PID. Any rogue processes were killed."
|
||||
kill -15 $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
|
||||
kill -15 $(ps axww | grep '[M]ailScanner': | awk '{print $1}') > /dev/null 2>&1
|
||||
# wait until they're gone.
|
||||
while (ps axww | grep -q '[M]ailScanner'); do
|
||||
sleep 1
|
||||
done
|
||||
rm -f $PIDFILE
|
||||
fi
|
||||
fi
|
||||
|
@ -485,7 +498,7 @@ case "$1" in
|
|||
else
|
||||
logger -i -p mail.notice "$NAME failed to start"
|
||||
echo "$NAME failed to start ... doh!"
|
||||
kill $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
|
||||
kill $(ps axww | grep '[M]ailScanner': | awk '{print $1}') > /dev/null 2>&1
|
||||
sleep 5
|
||||
exit 1
|
||||
fi
|
||||
|
@ -525,7 +538,7 @@ case "$1" in
|
|||
else
|
||||
logger -i -p mail.notice "$NAME failed to start"
|
||||
echo "$NAME failed to start ... doh!"
|
||||
kill $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
|
||||
kill $(ps axww | grep '[M]ailScanner': | awk '{print $1}') > /dev/null 2>&1
|
||||
sleep 5
|
||||
exit 1
|
||||
fi
|
||||
|
@ -536,6 +549,10 @@ case "$1" in
|
|||
[ "$VERBOSE" != no ] && logger -i -p mail.notice "Killing $NAME "
|
||||
echo "Killing $NAME and children ... mwa ha ha ha!"
|
||||
kill -9 $(ps axww | grep [M]ailScanner: | awk '{print $1}') > /dev/null 2>&1
|
||||
# wait until they're gone.
|
||||
while (ps axww | grep -q '[M]ailScanner'); do
|
||||
sleep 1
|
||||
done
|
||||
|
||||
# remove subsys
|
||||
if [ -f /var/lock/subsys/MailScanner ] ; then
|
||||
|
|
|
@ -73,7 +73,7 @@ if [ -f $PIDFILE ] ; then
|
|||
# get the PID
|
||||
PID=$(head -n 1 $PIDFILE)
|
||||
# check to see if running and belongs to mailscanner
|
||||
ps wwp $PID|grep -iq [M]ailScanner > /dev/null 2>&1
|
||||
ps wwp $PID|grep -iq '[M]ailScanner' > /dev/null 2>&1
|
||||
|
||||
# get the return
|
||||
RETVAL="$?"
|
||||
|
@ -100,8 +100,11 @@ else
|
|||
fi
|
||||
|
||||
# kill any rogue processes
|
||||
kill -15 $(ps axww | grep [M]ailScanner | awk '{print $1}') > /dev/null 2>&1
|
||||
|
||||
kill -15 $(ps axww | grep '[M]ailScanner' | awk '{print $1}') > /dev/null 2>&1
|
||||
# wait until they're gone.
|
||||
while (ps axww | grep -q '[M]ailScanner'); do
|
||||
sleep 1
|
||||
done
|
||||
|
||||
# log the start
|
||||
[ "$VERBOSE" != no ] && logger -i -p mail.notice "ms-check: starting mailscanner"
|
||||
|
|
Loading…
Reference in a new issue