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

Commit only when needed

This commit is contained in:
Ycarus (Yannick Chabanois) 2022-10-17 08:14:40 +02:00
parent 5195a71f6a
commit 70c25569e7

View file

@ -966,7 +966,7 @@ if [ "$OMR_TRACKER_STATUS" = "ERROR" ] || [ "$interface_up" != "true" ]; then
if [ -n "$OMR_TRACKER_INTERFACE" ]; then if [ -n "$OMR_TRACKER_INTERFACE" ]; then
uci -q delete openmptcprouter.$OMR_TRACKER_INTERFACE.lc uci -q delete openmptcprouter.$OMR_TRACKER_INTERFACE.lc
fi fi
uci -q commit openmptcprouter [ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
#ubus call network reload #ubus call network reload
# Set a little sleep after an interface error # Set a little sleep after an interface error
@ -1038,7 +1038,7 @@ if [ "$OMR_TRACKER_INTERFACE" = "glorytun" ] || [ "$OMR_TRACKER_INTERFACE" = "om
else else
uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.lc=$(date +"%s") uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.lc=$(date +"%s")
fi fi
uci -q commit openmptcprouter [ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
fi fi
nbserver=0 nbserver=0
piholeenabled=0 piholeenabled=0
@ -1053,7 +1053,7 @@ fi
if [ -n "$OMR_TRACKER_INTERFACE" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.vpn)" = "1" ]; then if [ -n "$OMR_TRACKER_INTERFACE" ] && [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.vpn)" = "1" ]; then
if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.state)" != "up" ]; then if [ "$(uci -q get openmptcprouter.$OMR_TRACKER_INTERFACE.state)" != "up" ]; then
uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.state='up' uci -q set openmptcprouter.$OMR_TRACKER_INTERFACE.state='up'
uci -q commit openmptcprouter [ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
fi fi
exit 0 exit 0
fi fi
@ -1517,7 +1517,7 @@ if [ -n "$OMR_TRACKER_INTERFACE" ] && ([ "$(uci -q get openmptcprouter.$OMR_TRAC
uci -q commit openmptcprouter uci -q commit openmptcprouter
else else
[ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "Get status and settings for $OMR_TRACKER_INTERFACE... Done" [ "$(uci -q get openmptcprouter.settings.debug)" = "true" ] && _log "Get status and settings for $OMR_TRACKER_INTERFACE... Done"
uci -q commit openmptcprouter [ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
if [ "$(pgrep openmptcprouter-vps)" = "" ] && ( [ "$(uci -q get openmptcprouter.settings.apilc)" = "" ] || [ $(($(date +"%s") - $(uci -q get openmptcprouter.settings.apilc))) -gt 3600 ] ); then if [ "$(pgrep openmptcprouter-vps)" = "" ] && ( [ "$(uci -q get openmptcprouter.settings.apilc)" = "" ] || [ $(($(date +"%s") - $(uci -q get openmptcprouter.settings.apilc))) -gt 3600 ] ); then
_log "Check API configuration..." _log "Check API configuration..."
/etc/init.d/openmptcprouter-vps restart >/dev/null 2>&1 /etc/init.d/openmptcprouter-vps restart >/dev/null 2>&1
@ -1553,8 +1553,8 @@ fi
uci -q set openmptcprouter.settings.master="change" uci -q set openmptcprouter.settings.master="change"
fi fi
if [ "$(uci -q get openmptcprouter.settings.master)" != "dynamic" ]; then if [ "$(uci -q get openmptcprouter.settings.master)" != "dynamic" ]; then
uci -q commit network [ -n "$(uci -q changes network)" ] && uci -q commit network
uci -q commit openmptcprouter [ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
fi fi
_log "Change master interface from $masterintf ($masterlatency ms) to $OMR_TRACKER_INTERFACE ($OMR_TRACKER_LATENCY ms)" _log "Change master interface from $masterintf ($masterlatency ms) to $OMR_TRACKER_INTERFACE ($OMR_TRACKER_LATENCY ms)"
fi fi
@ -1671,7 +1671,7 @@ set_get_config() {
if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ]; then if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" = "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ]; then
config_load openmptcprouter config_load openmptcprouter
config_foreach set_get_config server config_foreach set_get_config server
uci -q commit openmptcprouter [ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
fi fi
if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then if [ "$(uci -q get shadowsocks-libev.sss0.disabled)" != "1" ] && [ "$(uci -q get shadowsocks-libev.sss0.key)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "" ] && [ "$(uci -q get shadowsocks-libev.sss0.server)" != "192.18.1.3" ] && [ "$(pgrep -f omr-tracker-ss)" = "" ] && [ "$(pgrep -f '/etc/init.d/omr-tracker')" = "" ]; then
@ -1682,13 +1682,13 @@ fi
if [ "$(uci -q get glorytun.vpn.enable)" = "1" ] && [ "$(uci -q get glorytun.vpn.key)" = "" ]; then if [ "$(uci -q get glorytun.vpn.enable)" = "1" ] && [ "$(uci -q get glorytun.vpn.key)" = "" ]; then
config_load openmptcprouter config_load openmptcprouter
config_foreach set_get_config server config_foreach set_get_config server
uci -q commit openmptcprouter [ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
fi fi
if [ "$(uci -q get v2ray.main.enabled)" = "1" ] && [ "$(uci -q get v2ray.omrout.s_vless_user_id)" = "" ]; then if [ "$(uci -q get v2ray.main.enabled)" = "1" ] && [ "$(uci -q get v2ray.omrout.s_vless_user_id)" = "" ]; then
config_load openmptcprouter config_load openmptcprouter
config_foreach set_get_config server config_foreach set_get_config server
uci -q commit openmptcprouter [ -n "$(uci -q changes openmptcprouter)" ] && uci -q commit openmptcprouter
fi fi
if [ -n "$(logread | tail -n 2 | grep 'Ring expansion failed')" ]; then if [ -n "$(logread | tail -n 2 | grep 'Ring expansion failed')" ]; then