298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-06-11 00:32:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

luci ssr plus: ssr-monitor pdnsd status

Browse Source
This commit is contained in:
coolsnowwolf 2018-11-26 14:55:17 +08:00
parent a5532b9697
commit bb81f14df0
3 changed files with 20 additions and 16 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

@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-ssr-plus PKG_NAME:=luci-app-ssr-plus
PKG_VERSION:=1 PKG_VERSION:=1
PKG_RELEASE:=61 PKG_RELEASE:=62
PO2LMO:=$(STAGING_DIR_HOSTPKG)/bin/po2lmo PO2LMO:=$(STAGING_DIR_HOSTPKG)/bin/po2lmo

4
package/lean/luci-app-ssr-plus/root/etc/init.d/shadowsocksr
View File

@ -472,11 +472,11 @@ EOF
add_cron add_cron
if [ $(uci_get_by_type global monitor_enable) = 1 ] ;then if [ $(uci_get_by_type global monitor_enable) = 1 ] ;then
let total_count=server_count+redir_tcp+redir_udp+tunnel_enable+kcp_enable_flag+local_enable+dns_enable_flag+switch_enable let total_count=server_count+redir_tcp+redir_udp+tunnel_enable+kcp_enable_flag+local_enable+pdnsd_enable_flag+switch_enable
if [ $total_count -gt 0 ] if [ $total_count -gt 0 ]
then then
#param:server(count) redir_tcp(0:no,1:yes) redir_udp tunnel kcp local gfw #param:server(count) redir_tcp(0:no,1:yes) redir_udp tunnel kcp local gfw
service_start /usr/bin/ssr-monitor $server_count $redir_tcp $redir_udp $tunnel_enable $kcp_enable_flag $local_enable $dns_enable_flag $switch_enable service_start /usr/bin/ssr-monitor $server_count $redir_tcp $redir_udp $tunnel_enable $kcp_enable_flag $local_enable $pdnsd_enable_flag $switch_enable
fi fi
fi fi

30
package/lean/luci-app-ssr-plus/root/usr/bin/ssr-monitor
View File

@ -26,9 +26,9 @@ redir_udp_process=$3
tunnel_process=$4 tunnel_process=$4
kcp_process=$5 kcp_process=$5
local_process=$6 local_process=$6
dns_process=$7 pdnsd_process=$7
if [ -z "$dns_process" ] ;then if [ -z "$pdnsd_process" ] ;then
dns_process=0 pdnsd_process=0
fi fi
i=0 i=0
@ -114,15 +114,19 @@ do
( /usr/bin/ssr-local -c /var/etc/shadowsocksr_s.json -u -l $sock5_port -f /var/run/ssr-local.pid &) ( /usr/bin/ssr-local -c /var/etc/shadowsocksr_s.json -u -l $sock5_port -f /var/run/ssr-local.pid &)
fi fi
fi fi
#dns #pdnsd
if [ $dns_process -gt 0 ] ;then if [ $pdnsd_process -gt 0 ] ;then
icount=`ps -w | grep ssr-dns |grep -v grep| wc -l` icount=`ps -w | grep pdnsd |grep -v grep| wc -l`
if [ $icount -lt $dns_process ] #如果进程挂掉就重启它 if [ $icount -lt $pdnsd_process ] #Èç¹û½ø³Ì¹Òµô¾ÍÖØÆôËü
then then
logger -t "$NAME" "ssr dns tunnel error.restart!" logger -t "$NAME" "pdnsd tunnel error.restart!"
killall -q -9 ssr-tunnel if [ -f /var/run/pdnsd.pid ] ;then
kill $(cat /var/run/pdnsd.pid) >/dev/null 2>&1
else
kill -9 $(ps | grep pdnsd | grep -v grep | awk '{print $1}') >/dev/null 2>&1
fi
( /usr/bin/ssr-tunnel -c /var/etc/shadowsocksr.json -b 0.0.0.0 -u -l 5353 -L $(uci_get_by_type global tunnel_forward 8.8.4.4:53) -f /var/run/ssr-dns.pid &) ( /usr/sbin/pdnsd -c /var/etc/pdnsd.conf -d &)
fi fi
fi fi
done done