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

Add support log file for each daemons

Browse Source
This commit is contained in:
remittor 2025-02-08 18:14:23 +03:00
parent f62b289cb5
commit c6ea1147f5
3 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common/custom.sh
View File

@ -13,9 +13,16 @@ custom_runner()
dir_is_not_empty "$CUSTOM_DIR/custom.d" && { dir_is_not_empty "$CUSTOM_DIR/custom.d" && {
for script in "$CUSTOM_DIR/custom.d/"*; do for script in "$CUSTOM_DIR/custom.d/"*; do
[ -f "$script" ] || continue [ -f "$script" ] || continue
DAEMON_CFGNAME_SAVED="$DAEMON_CFGNAME"
unset DAEMON_CFGNAME
unset -f $FUNC unset -f $FUNC
. "$script" . "$script"
if [ -z "$DAEMON_CFGNAME" ]; then
DAEMON_CFGNAME="$(basename "$script")"
DAEMON_CFGNAME="${DAEMON_CFGNAME%%.*}"
fi
existf $FUNC && $FUNC "$@" existf $FUNC && $FUNC "$@"
DAEMON_CFGNAME="$DAEMON_CFGNAME_SAVED"
done done
} }
} }

2
config.default
View File

@ -133,3 +133,5 @@ DISABLE_IPV6=1
# possible values : get_user.sh get_antizapret.sh get_combined.sh get_reestr.sh get_hostlist.sh # possible values : get_user.sh get_antizapret.sh get_combined.sh get_reestr.sh get_hostlist.sh
# comment if not required # comment if not required
#GETLIST= #GETLIST=
DAEMON_LOG_FILE="/tmp/zapret+<DAEMON_NAME>+<DAEMON_IDNUM>+<DAEMON_CFGNAME>.log"

23
init.d/openwrt/zapret
View File

@ -50,17 +50,30 @@ TPWS_WAIT="--bind-wait-ifup=30 --bind-wait-ip=30"
TPWS_WAIT_SOCKS6="$TPWS_WAIT --bind-wait-ip-linklocal=30" TPWS_WAIT_SOCKS6="$TPWS_WAIT --bind-wait-ip-linklocal=30"
TPWS_OPT_BASE6_PRE="--bind-linklocal=prefer $TPWS_WAIT --bind-wait-ip-linklocal=3" TPWS_OPT_BASE6_PRE="--bind-linklocal=prefer $TPWS_WAIT --bind-wait-ip-linklocal=3"
DAEMON_CFGNAME="main"
run_daemon() run_daemon()
{ {
# $1 - daemon string id or number. can use 1,2,3,... # $1 - daemon string id or number. can use 1,2,3,...
local DAEMON_IDNUM=$1
# $2 - daemon # $2 - daemon
local DAEMON_PATH="$2"
# $3 - daemon args # $3 - daemon args
# use $PIDDIR/$DAEMONBASE$1.pid as pidfile local DAEMON_ARGS="$3"
local DAEMONBASE="$(basename "$2")" # use $PIDDIR/$DAEMON_NAME$DAEMON_IDNUM.pid as pidfile
echo "Starting daemon $1: $2 $3" local DAEMON_NAME="$(basename "$DAEMON_PATH")"
local DAEMON_LOG
echo "Starting daemon $DAEMON_IDNUM: $DAEMON_PATH $DAEMON_ARGS"
if [ -n "$DAEMON_LOG_FILE" -a "$DAEMON_NAME" = "nfqws" ]; then
DAEMON_LOG="$DAEMON_LOG_FILE"
DAEMON_LOG=${DAEMON_LOG/<DAEMON_NAME>/$DAEMON_NAME}
DAEMON_LOG=${DAEMON_LOG/<DAEMON_IDNUM>/$DAEMON_IDNUM}
DAEMON_LOG=${DAEMON_LOG/<DAEMON_CFGNAME>/$DAEMON_CFGNAME}
DAEMON_ARGS="--debug=@$DAEMON_LOG $DAEMON_ARGS"
fi
procd_open_instance procd_open_instance
procd_set_param command $2 $3 procd_set_param command $DAEMON_PATH $DAEMON_ARGS
procd_set_param pidfile $PIDDIR/$DAEMONBASE$1.pid procd_set_param pidfile $PIDDIR/$DAEMON_NAME$DAEMON_IDNUM.pid
procd_close_instance procd_close_instance
} }