From c6ea1147f526f7aabee3f217242a2f4fdba99f75 Mon Sep 17 00:00:00 2001
From: remittor <remittor@gmail.com>
Date: Sat, 8 Feb 2025 18:14:23 +0300
Subject: [PATCH] Add support log file for each daemons

---
 common/custom.sh      |  7 +++++++
 config.default        |  2 ++
 init.d/openwrt/zapret | 23 ++++++++++++++++++-----
 3 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/common/custom.sh b/common/custom.sh
index 0af19c0..41c0967 100644
--- a/common/custom.sh
+++ b/common/custom.sh
@@ -13,9 +13,16 @@ custom_runner()
 		dir_is_not_empty "$CUSTOM_DIR/custom.d" && {
 			for script in "$CUSTOM_DIR/custom.d/"*; do
 				[ -f "$script" ] || continue
+				DAEMON_CFGNAME_SAVED="$DAEMON_CFGNAME"
+				unset DAEMON_CFGNAME
 				unset -f $FUNC
 				. "$script"
+				if [ -z "$DAEMON_CFGNAME" ]; then
+					DAEMON_CFGNAME="$(basename "$script")"
+					DAEMON_CFGNAME="${DAEMON_CFGNAME%%.*}"
+				fi
 				existf $FUNC && $FUNC "$@"
+				DAEMON_CFGNAME="$DAEMON_CFGNAME_SAVED"
 			done
 		}
 	}
diff --git a/config.default b/config.default
index 3a79e59..2604b6f 100644
--- a/config.default
+++ b/config.default
@@ -133,3 +133,5 @@ DISABLE_IPV6=1
 # possible values : get_user.sh get_antizapret.sh get_combined.sh get_reestr.sh get_hostlist.sh
 # comment if not required
 #GETLIST=
+
+DAEMON_LOG_FILE="/tmp/zapret+<DAEMON_NAME>+<DAEMON_IDNUM>+<DAEMON_CFGNAME>.log"
diff --git a/init.d/openwrt/zapret b/init.d/openwrt/zapret
index 8d6d3a9..6b63d05 100755
--- a/init.d/openwrt/zapret
+++ b/init.d/openwrt/zapret
@@ -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_OPT_BASE6_PRE="--bind-linklocal=prefer $TPWS_WAIT --bind-wait-ip-linklocal=3"
 
+DAEMON_CFGNAME="main"
+
 run_daemon()
 {
 	# $1 - daemon string id or number. can use 1,2,3,...
+	local DAEMON_IDNUM=$1
 	# $2 - daemon
+	local DAEMON_PATH="$2"
 	# $3 - daemon args
-	# use $PIDDIR/$DAEMONBASE$1.pid as pidfile
-	local DAEMONBASE="$(basename "$2")"
-	echo "Starting daemon $1: $2 $3"
+	local DAEMON_ARGS="$3"
+	# use $PIDDIR/$DAEMON_NAME$DAEMON_IDNUM.pid as pidfile
+	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_set_param command $2 $3
-	procd_set_param pidfile $PIDDIR/$DAEMONBASE$1.pid
+	procd_set_param command $DAEMON_PATH $DAEMON_ARGS
+	procd_set_param pidfile $PIDDIR/$DAEMON_NAME$DAEMON_IDNUM.pid
 	procd_close_instance
 }