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 type None, API only or Ping only to OMR-Tracker server

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2024-08-01 11:58:46 +02:00
parent cb906c82f4
commit c36b666666
5 changed files with 38 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

7
luci-app-omr-tracker/htdocs/luci-static/resources/view/omr-tracker/network/server.js
View file

@ -44,6 +44,13 @@ return view.extend({
o.value('offline', _('Offline')); o.value('offline', _('Offline'));
o.modalonly = true; o.modalonly = true;
o = s.option(form.ListValue, 'type', _('Tracking method'),_('Check if VPS api answer or/and ping server IPs.'));
o.default = 'apiping';
o.value('apiping',_('API & Ping'));
o.value('api',_('API'));
o.value('ping',_('Ping'));
o.value('none',_('None'));
o = s.option(form.Flag, 'mail_alert', _('Mail alert'), o = s.option(form.Flag, 'mail_alert', _('Mail alert'),
_('Send a mail when connection status change. You need to configure e-mail settings here.')); _('Send a mail when connection status change. You need to configure e-mail settings here.'));
o.rmempty = false; o.rmempty = false;

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

@ -177,10 +177,18 @@ _check_master() {
[ -z "$serverip" ] && return [ -z "$serverip" ] && return
#_ping_server $serverip #_ping_server $serverip
#_check_server $serverip $port #_check_server $serverip $port
_check_server_intf $serverip $port if [ "$OMR_TRACKER_TYPE" = "api" ]; then
[ "$server_ping" = false ] && { _check_server_intf $serverip $port
elif [ "$OMR_TRACKER_TYPE" = "apiping" ]; then
_check_server_intf $serverip $port
[ "$server_ping" = false ] && {
_ping_server_intf $serverip
}
elif [ "$OMR_TRACKER_TYPE" = "ping" ]; then
_ping_server_intf $serverip _ping_server_intf $serverip
} elif [ "$OMR_TRACKER_TYPE" = "none" ]; then
server_ping=true
fi
[ "$server_ping" = true ] && { [ "$server_ping" = true ] && {
oneserverup="1" oneserverup="1"
} }
@ -375,10 +383,18 @@ _check_backup() {
[ -z "$serverip" ] && return [ -z "$serverip" ] && return
#_ping_server $serverip #_ping_server $serverip
#_check_server $serverip $port #_check_server $serverip $port
_check_server_intf $serverip $port if [ "$OMR_TRACKER_TYPE" = "api" ]; then
[ "$server_ping" = false ] && { _check_server_intf $serverip $port
elif [ "$OMR_TRACKER_TYPE" = "apiping" ]; then
_check_server_intf $serverip $port
[ "$server_ping" = false ] && {
_ping_server_intf $serverip
}
elif [ "$OMR_TRACKER_TYPE" = "ping" ]; then
_ping_server_intf $serverip _ping_server_intf $serverip
} elif [ "$OMR_TRACKER_TYPE" = "none" ]; then
server_ping=true
fi
[ "$server_ping" = true ] && { [ "$server_ping" = true ] && {
oneserverup="1" oneserverup="1"
} }

3
omr-tracker/files/etc/config/omr-tracker
View file

@ -67,4 +67,5 @@ config server 'server'
option wait_test '0' option wait_test '0'
option interval '5' option interval '5'
option mail_alert '0' option mail_alert '0'
option initial_state 'online' option initial_state 'online'
option type 'apiping'

1
omr-tracker/files/etc/init.d/omr-tracker
View file

@ -168,6 +168,7 @@ _launch_server_tracker() {
procd_append_param env "OMR_TRACKER_INTERVAL=$interval" procd_append_param env "OMR_TRACKER_INTERVAL=$interval"
procd_append_param env "OMR_TRACKER_INTERVAL_TRIES=$interval_tries" procd_append_param env "OMR_TRACKER_INTERVAL_TRIES=$interval_tries"
procd_append_param env "OMR_TRACKER_WAIT_TEST=$wait_test" procd_append_param env "OMR_TRACKER_WAIT_TEST=$wait_test"
procd_append_param env "OMR_TRACKER_TYPE=$type"
procd_set_param limits nofile="51200 51200" procd_set_param limits nofile="51200 51200"
procd_set_param respawn 0 10 0 procd_set_param respawn 0 10 0
procd_set_param stderr 1 procd_set_param stderr 1

6
omr-tracker/files/etc/uci-defaults/omr-tracker
View file

@ -136,5 +136,11 @@ if [ "$(uci -q get omr-tracker.defaults.family)" = "" ]; then
commit omr-tracker commit omr-tracker
EOF EOF
fi fi
if [ "$(uci -q get omr-tracker.server.type)" = "" ]; then
uci -q batch <<-EOF >/dev/null
set omr-tracker.server.type='apiping'
commit omr-tracker
EOF
fi
exit 0 exit 0