MailScanner/v5
1
1
Fork 0
mirror of https://github.com/MailScanner/v5.git synced 2024-09-20 15:26:08 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Thctlo patch msinit fix rotating (#165)

Browse source 
* Fix bug, wrong use in systemd file

syslog reports :  [/lib/systemd/system/mailscanner.service:19] Executable path is not absolute, ignoring: no
Removed the reload line from mailscanner.service file.

* disable rotating sign when stopping or deadpid.
This commit is contained in:
Louis van Belle 2018-03-06 12:38:29 +01:00 committed by Shawn Iverson
parent e807788360
commit c94d3d1d71
1 changed files with 29 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
common/usr/lib/MailScanner/init/ms-init
View file

@ -212,21 +212,22 @@ do_stop()
# process killed
if [ $RETVAL -eq 0 ]; then
# disable rotating sign when stopping.
# wait until it is gone.
s='-\|/';
x=0
i=0
RETVAL=0
while [ "$x" -lt 600 -a "$RETVAL" -eq 0 ]; do
ps wwp $PID | grep -q '[M]ailScanner': > /dev/null 2>&1
RETVAL="$?"
x=$((x+1));
i=$(( (i+1) %4 ))
printf "\r${s:$i:1}"
sleep .1
done
printf "\r"
echo " "
#s='-\|/';
#x=0
#i=0
#RETVAL=0
#while [ "$x" -lt 600 -a "$RETVAL" -eq 0 ]; do
# ps wwp $PID | grep -q '[M]ailScanner': > /dev/null 2>&1
# RETVAL="$?"
# x=$((x+1));
# i=$(( (i+1) %4 ))
# printf "\r${s:$i:1}"
# sleep .1
#done
#printf "\r"
#echo " "
# Check again
ps wwp $PID|grep -q '[M]ailScanner': > /dev/null 2>&1
@ -301,19 +302,19 @@ do_deadpid()
[ "$VERBOSE" != no ] && logger -i -p mail.notice "Found a possible dead PID. Stopping all $NAME rogue processes ..."
kill -15 $(ps axww | grep '[M]ailScanner': | awk '{print $1}') > /dev/null 2>&1
# wait until they're gone.
s='-\|/';
x=0
i=0
RETVAL=0
while [ "$x" -lt 600 -a "$RETVAL" -eq 0 ]; do
ps axww | grep -q '[M]ailScanner':
RETVAL="$?"
x=$((x+1));
i=$(( (i+1) %4 ))
printf "\r${s:$i:1}"
sleep .1
done
printf "\r"
#s='-\|/';
#x=0
#i=0
#RETVAL=0
#while [ "$x" -lt 600 -a "$RETVAL" -eq 0 ]; do
# ps axww | grep -q '[M]ailScanner':
# RETVAL="$?"
# x=$((x+1));
# i=$(( (i+1) %4 ))
# printf "\r${s:$i:1}"
# sleep .1
#done
#printf "\r"
# Check again
if [ $(ps axww | grep -q '[M]ailScanner': ) ]; then
@ -668,4 +669,4 @@ case "$1" in
exit 3
;;
esac
exit 0
exit 0