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

Add possibility to run script to all OMR-Tracker

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-03-28 18:38:19 +01:00
parent ac1632cc85
commit 71336e9527
4 changed files with 67 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

16
omr-tracker/files/bin/omr-tracker-server
View file

@ -10,6 +10,18 @@ _log() {
logger -p daemon.info -t "${basename}" "$@"
}
_post_tracking() {
[ ! -d /usr/share/omr/server-post-tracking.d/ ] && return
for tracker_bin in /usr/share/omr/server-post-tracking.d/*; do
[ -x "$tracker_bin" ] && (
_log() {
logger -t "post-tracking-${tracker_bin##*/}" "$*"
}
. "$tracker_bin" 2>&1
)
done
}
_ping_server() {
local host=$1
ret=$(ping \
@ -132,7 +144,7 @@ _check_master() {
set_ip() {
ip="$serverip"
if [ "$server_ping" = true ]; then
if [ "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n')" != "$ip" ]; then
if [ "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n')" != "$ip" ] && [ "$(uci -q get shadowsocks-rust.sss${count}.server | tr -d '\n')" != "$ip" ]; then
logger -t "OMR-Tracker-Server" "Master server ${name} up ($ip), set it back"
changes="1"
#logger -t "OMR-Tracker-Server" "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n') - $ip"
@ -283,7 +295,7 @@ _check_backup() {
ip="$serverip"
#[ "$server_ping" = true ] && [ "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n')" = "$ip" ] && break
if [ "$server_ping" = true ]; then
if [ "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n')" != "$ip" ]; then
if [ "$(uci -q get shadowsocks-libev.sss${count}.server | tr -d '\n')" != "$ip" ] && [ "$(uci -q get shadowsocks-rust.sss${count}.server | tr -d '\n')" != "$ip" ]; then
logger -t "OMR-Tracker-Server" "Use backup server $1 ($ip)"
changes="1"
uci -q batch <<-EOF >/dev/null

18
omr-tracker/files/bin/omr-tracker-ss
View file

@ -18,6 +18,18 @@ _log() {
logger -p daemon.info -t "${basename}" "$@"
}
_post_tracking() {
[ ! -d /usr/share/omr/ss-post-tracking.d ] && return
for tracker_bin in /usr/share/omr/ss-post-tracking.d/*; do
[ -x "$tracker_bin" ] && (
_log() {
logger -t "ss-post-tracking-${tracker_bin##*/}" "$*"
}
. "$tracker_bin" 2>&1
)
done
}
_ping_server() {
local host=$1
ret=$(ping \
@ -74,6 +86,8 @@ uci -q set openmptcprouter.omr=router
uci -q delete openmptcprouter.omr.shadowsocks=""
_get_ip
OMR_TRACKER_PREV_STATUS=""
while true; do
host="${hosts%% *}"
[ "$host" = "$hosts" ] || {
@ -116,6 +130,7 @@ while true; do
fi
[ "$(uci -q get openmptcprouter.omr.detected_public_ipv4)" = "" ] || ([ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ] && [ "$(uci -q get openmptcprouter.omr.detected_public_ipv6)" = "" ]) && _get_ip
last=0
OMR_TRACKER_STATUS="OK"
else
last=$((last + 1 ))
[ -z "$nocontact" ] && nocontact="$host" || nocontact="$nocontact, $host"
@ -175,6 +190,9 @@ while true; do
sleep $wait_test
fi
}
OMR_TRACKER_STATUS="ERROR"
fi
_post_tracking
OMR_TRACKER_PREV_STATUS="$OMR_TRACKER_STATUS"
sleep "${interval}"
done

17
omr-tracker/files/bin/omr-tracker-v2ray
View file

@ -15,6 +15,18 @@ _log() {
logger -p daemon.info -t "${basename}" "$@"
}
_post_tracking() {
[ ! -d /usr/share/omr/v2ray-post-tracking.d ] && return
for tracker_bin in /usr/share/omr/v2ray-post-tracking.d/*; do
[ -x "$tracker_bin" ] && (
_log() {
logger -t "v2ray-post-tracking-${tracker_bin##*/}" "$*"
}
. "$tracker_bin" 2>&1
)
done
}
_ping_server() {
local host=$1
ret=$(ping \
@ -70,6 +82,7 @@ uci -q set openmptcprouter.omr=router
uci -q delete openmptcprouter.omr.v2ray
_get_ip
OMR_TRACKER_PREV_STATUS=""
while true; do
host="${hosts%% *}"
[ "$host" = "$hosts" ] || {
@ -107,6 +120,7 @@ while true; do
fi
[ "$(uci -q get openmptcprouter.omr.detected_public_ipv4)" = "" ] || ([ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ] && [ "$(uci -q get openmptcprouter.omr.detected_public_ipv6)" = "" ]) && _get_ip
last=0
OMR_TRACKER_STATUS="OK"
else
last=$((last + 1 ))
[ -z "$nocontact" ] && nocontact="$host" || nocontact="$nocontact, $host"
@ -145,6 +159,9 @@ while true; do
sleep $wait_test
fi
}
OMR_TRACKER_STATUS="ERROR"
fi
_post_tracking
OMR_TRACKER_PREV_STATUS="$OMR_TRACKER_STATUS"
sleep "${interval}"
done

18
omr-tracker/files/bin/omr-tracker-xray
View file

@ -15,6 +15,19 @@ _log() {
logger -p daemon.info -t "${basename}" "$@"
}
_post_tracking() {
[ ! -d /usr/share/omr/xray-post-tracking.d ] && return
for tracker_bin in /usr/share/omr/xray-post-tracking.d/*; do
[ -x "$tracker_bin" ] && (
_log() {
logger -t "xray-post-tracking-${tracker_bin##*/}" "$*"
}
. "$tracker_bin" 2>&1
)
done
}
_ping_server() {
local host=$1
ret=$(ping \
@ -70,6 +83,7 @@ uci -q set openmptcprouter.omr=router
uci -q delete openmptcprouter.omr.xray
_get_ip
OMR_TRACKER_PREV_STATUS=""
while true; do
host="${hosts%% *}"
[ "$host" = "$hosts" ] || {
@ -107,6 +121,7 @@ while true; do
fi
[ "$(uci -q get openmptcprouter.omr.detected_public_ipv4)" = "" ] || ([ "$(uci -q get openmptcprouter.settings.disable_ipv6)" != "1" ] && [ "$(uci -q get openmptcprouter.omr.detected_public_ipv6)" = "" ]) && _get_ip
last=0
OMR_TRACKER_STATUS="OK"
else
last=$((last + 1 ))
[ -z "$nocontact" ] && nocontact="$host" || nocontact="$nocontact, $host"
@ -145,6 +160,9 @@ while true; do
sleep $wait_test
fi
}
OMR_TRACKER_STATUS="ERROR"
fi
_post_tracking
OMR_TRACKER_PREV_STATUS="$OMR_TRACKER_STATUS"
sleep "${interval}"
done