1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00

Merge branch 'test' into develop

This commit is contained in:
suyuan 2023-10-07 23:40:56 +08:00
commit b82119b759
10 changed files with 113 additions and 37 deletions

View file

@ -166,7 +166,7 @@ while true; do
/etc/init.d/shadowsocks-libev restart
sleep 5
fi
if [ "$type" = "rust" ] && [ "$(pgrep ss-redir)" = "" ] && [ "$(uci -q get shadowsocks-libev.${server}.key)" != "" ]; then
if [ "$type" = "rust" ] && [ "$(pgrep sslocal)" = "" ] && [ "$(uci -q get shadowsocks-libev.${server}.key)" != "" ]; then
_log "Can't find shadowsocks rust, restart it..."
/etc/init.d/shadowsocks-rust restart
sleep 5

View file

@ -243,7 +243,7 @@ _launch_shadowsocks_tracker() {
procd_append_param env "OMR_TRACKER_TRIES=$tries"
procd_append_param env "OMR_TRACKER_INTERVAL=$interval"
procd_append_param env "OMR_TRACKER_PROXY=127.0.0.1:$local_port"
procd_append_param env "OMR_TRACKER_WAIT_TEST=$type"
procd_append_param env "OMR_TRACKER_WAIT_TEST=$wait_test"
procd_append_param env "OMR_TRACKER_SERVER=$server"
procd_append_param env "OMR_TRACKER_SS_TYPE=libev"
procd_set_param limits nofile="51200 51200"
@ -277,7 +277,7 @@ _launch_shadowsocks_rust_tracker() {
procd_append_param env "OMR_TRACKER_TRIES=$tries"
procd_append_param env "OMR_TRACKER_INTERVAL=$interval"
procd_append_param env "OMR_TRACKER_PROXY=127.0.0.1:$local_port"
procd_append_param env "OMR_TRACKER_WAIT_TEST=$type"
procd_append_param env "OMR_TRACKER_WAIT_TEST=$wait_test"
procd_append_param env "OMR_TRACKER_SERVER=$server"
procd_append_param env "OMR_TRACKER_SS_TYPE=rust"
procd_set_param limits nofile="51200 51200"