drygdryg/zapret
1
0
Fork 0
mirror of https://github.com/bol-van/zapret.git synced 2025-04-19 13:32:58 +03:00
Code Issues Packages Projects Releases Wiki Activity

sysv: remove daemonize. use pgrep to detect already running state

Browse Source
This commit is contained in:
bolvan 2019-05-08 13:38:37 +03:00
parent 9bc42db2d5
commit bce09d0772
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/readme.txt
View File

@ -312,7 +312,7 @@ Centos с 7 версии и более-менее новые федоры пос
В качестве пакетного менеджера используется yum. В качестве пакетного менеджера используется yum.
Установить пакеты : Установить пакеты :
yum install -y curl ipset dnsutils git daemonize yum install -y curl ipset dnsutils git
Далее все аналогично debian. Далее все аналогично debian.

18
init.d/sysv/zapret
View File

@ -108,16 +108,18 @@ run_daemon()
echo "Starting daemon $1: $2 $3" echo "Starting daemon $1: $2 $3"
if exists start-stop-daemon ; then if exists start-stop-daemon ; then
start-stop-daemon --start --pidfile "$PIDFILE" --background --make-pidfile --exec "$2" -- $3 || true start-stop-daemon --start --pidfile "$PIDFILE" --background --make-pidfile --exec "$2" -- $3 || true
elif exists daemonize ; then
daemonize -p "$PIDFILE" "$2" $3
else else
nohup "$2" $3 >/dev/null 2>/dev/null & if [ -f "$PIDFILE" ] && pgrep -F "$PIDFILE" $(basename "$2") >/dev/null; then
PID=$(jobs -p %$JOBCT) echo already running
if [ -n "$PID" ]; then
echo $PID >$PIDFILE
JOBCT=$(($JOBCT+1))
else else
echo could not start daemon $1 : $2 $3 nohup "$2" $3 >/dev/null 2>/dev/null &
PID=$(jobs -p %$JOBCT)
if [ -n "$PID" ]; then
echo $PID >$PIDFILE
JOBCT=$(($JOBCT+1))
else
echo could not start daemon $1 : $2 $3
fi
fi fi
fi fi
} }