From 105653108abdeb139bff2f881102b577a8780e70 Mon Sep 17 00:00:00 2001 From: Ycarus Date: Fri, 30 Mar 2018 11:12:14 +0200 Subject: [PATCH] Add option to disable omr-tracker --- luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua | 8 ++++++++ omr-tracker/files/etc/config/omr-tracker | 4 ++++ omr-tracker/files/etc/init.d/omr-tracker | 5 ++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua index 1dfb529e4..85012392e 100644 --- a/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua +++ b/luci-app-omr-tracker/luasrc/model/cbi/omr-tracker.lua @@ -8,6 +8,10 @@ m = Map("omr-tracker", translate("OMR-Tracker"), translate("OMR-Tracker detect w s = m:section(TypedSection, "defaults", translate("Defaults Settings")) s.anonymous = true +o = s:option(Flag, "enabled", translate("Enable"), translate("When tracker is disabled, connection failover is also disabled")) +o.default = true +o.rmempty = false + o = s:option(Value, "timeout", translate("Timeout (s)")) o.placeholder = "1" o.default = "1" @@ -48,6 +52,10 @@ for _, iface in ipairs(ifaces) do end end +o = s:option(Flag, "enabled", translate("Enable")) +o.default = true +o.rmempty = false + o = s:option(Value, "timeout", translate("Timeout (s)")) o.placeholder = "1" o.default = "1" diff --git a/omr-tracker/files/etc/config/omr-tracker b/omr-tracker/files/etc/config/omr-tracker index b24dd3f75..e29aa6249 100644 --- a/omr-tracker/files/etc/config/omr-tracker +++ b/omr-tracker/files/etc/config/omr-tracker @@ -1,6 +1,10 @@ config defaults 'defaults' list hosts '4.2.2.1' list hosts '8.8.8.8' + list hosts '8.8.4.4' + list hosts '9.9.9.9' + list hosts '1.1.1.1' + list hosts '1.0.0.1' option timeout '1' option tries '4' option interval '2' diff --git a/omr-tracker/files/etc/init.d/omr-tracker b/omr-tracker/files/etc/init.d/omr-tracker index 6a421a42c..492c0a81a 100755 --- a/omr-tracker/files/etc/init.d/omr-tracker +++ b/omr-tracker/files/etc/init.d/omr-tracker @@ -11,7 +11,7 @@ _validate_section() { local tmp_hosts=$hosts tmp_timeout=$timeout tmp_tries=$tries - local tmp_interval=$interval tmp_options=$options tmp_type=$type + local tmp_interval=$interval tmp_options=$options tmp_type=$type tmp_enabled=$enabled uci_validate_section omr-tracker "$1" "$2" \ 'hosts:list(host)' \ @@ -19,6 +19,7 @@ _validate_section() { 'tries:uinteger' \ 'interval:uinteger' \ 'type:string' \ + 'enabled:bool:1' \ 'options:string' [ -z "$hosts" ] && hosts=$tmp_hosts @@ -27,6 +28,7 @@ _validate_section() { [ -z "$interval" ] && interval=$tmp_interval [ -z "$options" ] && options=$tmp_options [ -z "$type" ] && type=$tmp_type + [ -z "$enabled" ] && enabled=$tmp_enabled } _launch_tracker() { @@ -47,6 +49,7 @@ _launch_tracker() { config_get gateway "$1" gateway [ -z "$ifname" ] || [ -z "$multipath" ] || [ "$multipath" = "off" ] && [ "$1" != "glorytun" ] && return + [ $enabled = 0 ] && return [ -z "$type" ] && type="ping" procd_open_instance