diff --git a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js index 086926e..78180ef 100644 --- a/luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js +++ b/luci-app-podkop/htdocs/luci-static/resources/view/podkop/settings.js @@ -119,7 +119,7 @@ function createSettingsContent(section) { o = section.option( form.Flag, - 'mon_restart_ifaces', + 'enable_badwan_interface_monitoring', _('Interface Monitoring'), _('Interface monitoring for Bad WAN'), ); @@ -132,7 +132,7 @@ function createSettingsContent(section) { _('Interface for monitoring'), _('Select the WAN interfaces to be monitored'), ); - o.depends('mon_restart_ifaces', '1'); + o.depends('enable_badwan_interface_monitoring', '1'); o.multiple = true; o.filter = function (section_id, value) { // Reject if the value is in the blocked list ['lan', 'loopback'] @@ -155,7 +155,7 @@ function createSettingsContent(section) { _('Interface Monitoring Delay'), _('Delay in milliseconds before reloading podkop after interface UP'), ); - o.depends('mon_restart_ifaces', '1'); + o.depends('enable_badwan_interface_monitoring', '1'); o.default = '2000'; o.rmempty = false; o.validate = function (section_id, value) { diff --git a/podkop/files/etc/init.d/podkop b/podkop/files/etc/init.d/podkop index 49fbde9..469fdf0 100755 --- a/podkop/files/etc/init.d/podkop +++ b/podkop/files/etc/init.d/podkop @@ -10,15 +10,15 @@ config_load "$NAME" start_service() { echo "Start podkop" - config_get mon_restart_ifaces "settings" "mon_restart_ifaces" - config_get restart_ifaces "settings" "restart_ifaces" + config_get enable_badwan_interface_monitoring "settings" "enable_badwan_interface_monitoring" + config_get restart_ifaces "settings" "restart_ifaces" - procd_open_instance - procd_set_param command /usr/bin/podkop start - [ "$mon_restart_ifaces" = "1" ] && [ -n "$restart_ifaces" ] && procd_set_param netdev $restart_ifaces - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_close_instance + procd_open_instance + procd_set_param command /usr/bin/podkop start + [ "$enable_badwan_interface_monitoring" = "1" ] && [ -n "$restart_ifaces" ] && procd_set_param netdev $restart_ifaces + procd_set_param stdout 1 + procd_set_param stderr 1 + procd_close_instance } stop_service() { @@ -32,19 +32,19 @@ reload_service() { service_triggers() { echo "service_triggers start" - config_get mon_restart_ifaces "settings" "mon_restart_ifaces" - config_get restart_ifaces "settings" "restart_ifaces" - config_get procd_reload_delay "settings" "procd_reload_delay" "2000" + config_get enable_badwan_interface_monitoring "settings" "enable_badwan_interface_monitoring" + config_get restart_ifaces "settings" "restart_ifaces" + config_get procd_reload_delay "settings" "procd_reload_delay" "2000" PROCD_RELOAD_DELAY=$procd_reload_delay - procd_open_trigger - procd_add_config_trigger "config.change" "$NAME" "$initscript" restart 'on_config_change' + procd_open_trigger + procd_add_config_trigger "config.change" "$NAME" "$initscript" restart 'on_config_change' - if [ "$mon_restart_ifaces" = "1" ]; then - for iface in $restart_ifaces; do - procd_add_interface_trigger "interface.*.up" "$iface" /etc/init.d/podkop reload - done - fi - procd_close_trigger -} \ No newline at end of file + if [ "$enable_badwan_interface_monitoring" = "1" ]; then + for iface in $restart_ifaces; do + procd_add_interface_trigger "interface.*.up" "$iface" /etc/init.d/podkop reload + done + fi + procd_close_trigger +}