Nanako/DHDAXCW-Rockchip-OpenWrt
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix ss as main server status detection in ssr plus

Browse Source
This commit is contained in:
coolsnowwolf 2018-11-10 15:19:51 +08:00
parent 01d511c6ba
commit 9a9be8cd56
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/lean/luci-app-ssr-plus/Makefile
View File

@ -9,7 +9,7 @@ LUCI_TITLE:=LuCI support for SSR Plus
LUCI_DEPENDS:=+shadowsocksr-libev-alt +shadowsocks-libev-ss-redir +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +bash +pdnsd-alt +wget LUCI_DEPENDS:=+shadowsocksr-libev-alt +shadowsocks-libev-ss-redir +ipset +ip-full +iptables-mod-tproxy +dnsmasq-full +coreutils +coreutils-base64 +bash +pdnsd-alt +wget
LUCI_PKGARCH:=all LUCI_PKGARCH:=all
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=35 PKG_RELEASE:=36
include $(TOPDIR)/feeds/luci/luci.mk include $(TOPDIR)/feeds/luci/luci.mk

2
package/lean/luci-app-ssr-plus/luasrc/controller/shadowsocksr.lua
View File

@ -39,7 +39,7 @@ end
function act_status() function act_status()
local e={} local e={}
e.running=luci.sys.call("pgrep ssr-redir >/dev/null")==0 e.running=luci.sys.call("ps -w | grep ssr-retcp | grep -v grep >/dev/null")==0
luci.http.prepare_content("application/json") luci.http.prepare_content("application/json")
luci.http.write_json(e) luci.http.write_json(e)
end end

2
package/lean/luci-app-ssr-plus/luasrc/model/cbi/shadowsocksr/status.lua
View File

@ -66,7 +66,7 @@ end
end end
if luci.sys.call("pidof ssr-redir >/dev/null") == 0 then if luci.sys.call("ps -w | grep ssr-retcp | grep -v grep >/dev/null") == 0 then
redir_run=1 redir_run=1
end end