From f3ccd27262528ac4feb58795196e189b5f2cb2b2 Mon Sep 17 00:00:00 2001 From: Mattraks <16359027+Mattraks@users.noreply.github.com> Date: Wed, 30 Dec 2020 16:33:48 +0800 Subject: [PATCH] luci-app-ssr-plus: fix process daemon bug --- package/lean/luci-app-ssr-plus/Makefile | 2 +- .../luasrc/controller/shadowsocksr.lua | 2 +- .../luasrc/view/shadowsocksr/ssrurl.htm | 2 +- .../root/etc/init.d/shadowsocksr | 2 ++ .../luci-app-ssr-plus/root/usr/bin/ssr-monitor | 16 ++++++++-------- 5 files changed, 13 insertions(+), 11 deletions(-) diff --git a/package/lean/luci-app-ssr-plus/Makefile b/package/lean/luci-app-ssr-plus/Makefile index 2718d6b7df..c3179c29e5 100644 --- a/package/lean/luci-app-ssr-plus/Makefile +++ b/package/lean/luci-app-ssr-plus/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-ssr-plus PKG_VERSION:=182 -PKG_RELEASE:=2 +PKG_RELEASE:=3 define Package/$(PKG_NAME)/conffiles /etc/config/shadowsocksr diff --git a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua index 09c63309c6..2fe43138a8 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua +++ b/package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua @@ -4,7 +4,7 @@ module("luci.controller.shadowsocksr", package.seeall) function index() if not nixio.fs.access("/etc/config/shadowsocksr") then - return + call("act_reset") end entry({"admin", "services", "shadowsocksr"}, alias("admin", "services", "shadowsocksr", "client"), _("ShadowSocksR Plus+"), 10).dependent = true entry({"admin", "services", "shadowsocksr", "client"}, cbi("shadowsocksr/client"), _("SSR Client"), 10).leaf = true diff --git a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm index 84d150481a..123aa2ca4c 100644 --- a/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm +++ b/package/lean/luci-app-ssr-plus/luasrc/view/shadowsocksr/ssrurl.htm @@ -218,7 +218,7 @@ function import_ssr_url(btn, urlname, sid) { document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls')[0].checked = true; document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls')[0].dispatchEvent(event); document.getElementsByName('cbid.shadowsocksr.' + sid + '.tls_host')[0].value = queryParam.peer || ''; - document.getElementsByName('cbid.shadowsocksr.' + sid + '.insecure')[0].checked = queryParam.allowInsecure === '1'; + document.getElementsByName('cbid.shadowsocksr.' + sid + '.insecure')[0].checked = queryParam.allowInsecure == '1'; if (param != undefined) { document.getElementsByName('cbid.shadowsocksr.' + sid + '.alias')[0].value = decodeURI(param); } diff --git a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr index 490109c36f..902bf25f27 100755 --- a/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr +++ b/package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr @@ -589,12 +589,14 @@ load_config() { LOCAL_SERVER=$GLOBAL_SERVER local_config_file=$TMP_PATH/tcp-udp-ssr-local.json start_local + local_enable=0 ;; *) if [ "$LOCAL_SERVER" == "$GLOBAL_SERVER" ]; then _local="1" local_config_file=$TMP_PATH/tcp-udp-ssr-local.json start_local + local_enable=0 else _local="2" local_config_file=$TMP_PATH/tcp-udp-ssr-local.json diff --git a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-monitor b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-monitor index 964e06a6bb..e590440696 100755 --- a/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-monitor +++ b/package/lean/luci-app-ssr-plus/root/usr/bin/ssr-monitor @@ -34,8 +34,8 @@ while [ "1" == "1" ]; do #死循环 if [ "$redir_tcp_process" -gt 0 ]; then icount=$(busybox ps -w | grep ssr-retcp | grep -v grep | wc -l) if [ "$icount" == 0 ]; then - logger -t "$NAME" "ssr redir tcp error.restart!" - echolog "ssr redir tcp error.restart!" + logger -t "$NAME" "ssrplus redir tcp error.restart!" + echolog "ssrplus redir tcp error.restart!" /etc/init.d/shadowsocksr restart exit 0 fi @@ -44,8 +44,8 @@ while [ "1" == "1" ]; do #死循环 if [ "$redir_udp_process" -gt 0 ]; then icount=$(busybox ps -w | grep ssr-reudp | grep -v grep | wc -l) if [ "$icount" == 0 ]; then - logger -t "$NAME" "ssr redir udp error.restart!" - echolog "ssr redir udp error.restart!" + logger -t "$NAME" "ssrplus redir udp error.restart!" + echolog "ssrplus redir udp error.restart!" /etc/init.d/shadowsocksr restart exit 0 fi @@ -54,8 +54,8 @@ while [ "1" == "1" ]; do #死循环 if [ "$server_process_count" -gt 0 ]; then icount=$(busybox ps -w | grep ssr-server | grep -v grep | wc -l) if [ "$icount" -lt "$server_process_count" ]; then #如果进程挂掉就重启它 - logger -t "$NAME" "ssr server error.restart!" - echolog "ssr server error.restart!" + logger -t "$NAME" "ssrplus server error.restart!" + echolog "ssrplus server error.restart!" kill -9 $(busybox ps -w | grep ssr-server | grep -v grep | awk '{print $1}') >/dev/null 2>&1 /etc/init.d/shadowsocksr restart exit 0 @@ -65,8 +65,8 @@ while [ "1" == "1" ]; do #死循环 if [ "$kcp_process" -gt 0 ]; then icount=$(busybox ps -w | grep kcptun-client | grep -v grep | wc -l) if [ "$icount" -lt "$kcp_process" ]; then #如果进程挂掉就重启它 - logger -t "$NAME" "ssr kcptun error.restart!" - echolog "ssr kcptun error.restart!" + logger -t "$NAME" "ssrplus kcptun error.restart!" + echolog "ssrplus kcptun error.restart!" killall -q -9 kcptun-client (/usr/bin/kcptun-client -r $server:$kcp_port -l :$server_port $password $kcp_param &) fi