watchcat: add ability to restart interface + refactor
[feed/packages.git] / utils / watchcat / files / initd_watchcat
index a9bc03522c177a73a17983f084b8cdff885346c6..95f59271f61fdcf0775a3f884ea973b803145974 100644 (file)
@@ -5,10 +5,10 @@ START=97
 PIDFILE="/tmp/run/watchcat"
 
 append_string() {
-       local varname="$1"
-       local add="$2"
-       local separator="${3:- }"
-       local actual
+       varname="$1"
+       add="$2"
+       separator="${3:- }"
+       actual
        eval "actual=\$$varname"
 
        new="${actual:+$actual$separator}$add"
@@ -16,29 +16,31 @@ append_string() {
 }
 
 time_to_seconds() {
-       local time=$1
-       unset seconds
+       time=$1
 
        { [ "$time" -ge 1 ] 2>/dev/null && seconds="$time"; } ||
                { [ "${time%s}" -ge 1 ] 2>/dev/null && seconds="${time%s}"; } ||
                { [ "${time%m}" -ge 1 ] 2>/dev/null && seconds=$((${time%m} * 60)); } ||
                { [ "${time%h}" -ge 1 ] 2>/dev/null && seconds=$((${time%h} * 3600)); } ||
                { [ "${time%d}" -ge 1 ] 2>/dev/null && seconds=$((${time%d} * 86400)); }
+
+       echo $seconds
+       unset seconds
+       unset time
 }
 
 load_watchcat() {
-       config_get period $1 period
-       config_get mode $1 mode
-       config_get pinghosts $1 pinghosts
-       config_get ping_period $1 ping_period
-       config_get no_ping_time $1 no_ping_time
-       config_get force_delay $1 force_delay
-       config_get ping_size $1 ping_size "standard"
-
-       local nopingtime_dflt="900"
-       local force_delay_default="60"
-
-       # Fix potential typo in mode (backward compatibility).
+       config_get period "$1" period "120"
+       config_get mode "$1" mode "restart_iface"
+       config_get pinghosts "$1" pinghosts "8.8.8.8"
+       config_get pingperiod "$1" pingperiod "60"
+       config_get forcedelay "$1" forcedelay "60"
+       config_get pingsize "$1" pingsize "standard"
+       config_get interface "$1" interface
+       config_get mmifacename "$1" mmifacename
+       config_get unlockbands "$1" unlockbands "0"
+
+       # Fix potential typo in mode and provide backward compatibility.
        [ "$mode" = "allways" ] && mode="periodic_reboot"
        [ "$mode" = "always" ] && mode="periodic_reboot"
        [ "$mode" = "ping" ] && mode="ping_reboot"
@@ -46,62 +48,42 @@ load_watchcat() {
        error=""
        warn=""
 
-       if [ -z "$period" ]; then
-               append_string "error" "period is not set! Use time value(ex: '30'; '4m'; '6h'; '2d')." "; "
-       else
-               time_to_seconds "$period"
-               period="$seconds"
-               [ "$period" -ge 1 ] ||
-                       append_string "error" "period has invalid format! Use time value(ex: '30'; '4m'; '6h'; '2d')" "; "
+       # Checks for settings common to all operation modes
+       if [ "$mode" != "periodic_reboot" ] && [ "$mode" != "ping_reboot" ] && [ "$mode" != "restart_iface" ]; then
+               append_string "error" "mode must be 'periodic_reboot' or 'ping_reboot' or 'restart_iface'" "; "
        fi
 
-       [ "$mode" = "periodic_reboot" -o "$mode" = "ping_reboot" ] ||
-               append_string "error" "mode must be 'periodic_reboot' or 'ping_reboot'" "; "
+       period="$(time_to_seconds "$period")"
+       [ "$period" -ge 1 ] ||
+               append_string "error" "period has invalid format! Use time value(ex: '30'; '4m'; '6h'; '2d')" "; "
 
-       if [ -z "$force_delay" ]; then
-               force_delay="$force_delay_default"
-               append_string "warn" "force_delay is not configured! Defaulted to $force_delay seconds" "; "
-       else
-               [ "$force_delay" -ge 0 ] || {
-                       force_delay="$force_delay_default"
-                       append_string "warn" "force_delay is invalid! Defaulted to $force_delay seconds" "; "
-               }
-       fi
+       # ping_reboot mode and restart_iface mode specific checks
+       if [ "$mode" = "ping_reboot" ] || [ "$mode" = "restart_iface" ]; then
 
-       [ -z "$error" -a "$mode" = "ping_reboot" ] && {
-               [ -z "$pinghosts" ] &&
-                       append_string "error" "pinghosts must be set in 'ping_reboot' mode! Use space separated address list (ex: '8.8.8.8 9.9.9.9')" "; "
-
-               if [ -z "$no_ping_time" ]; then
-                       no_ping_time="$nopingtime_dflt"
-                       append_string "warn" "no_ping_time is not configured! Defaulted to $no_ping_time seconds" "; "
-               else
-                       time_to_seconds "$no_ping_time"
-                       no_ping_time="$seconds"
-                       [ "$no_ping_time" -ge 0 ] || {
-                               no_ping_time="$nopingtime_dflt"
-                               append_string "warn" "no_ping_time invalid format! Use time value(ex: '30'; '4m'; '6h'; '2d'). Defaulted to $no_ping_time seconds" "; "
-                       }
-               fi
+               if [ -z "$error" ]; then
+
+                       pingperiod_default="$((period / 5))"
+
+                       pingperiod="$(time_to_seconds "$pingperiod")"
+                       if [ "$pingperiod" -ge 0 ] && [ "$pingperiod" -ge "$period" ]; then
+                               pingperiod="$(time_to_seconds "$pingperiod_default")"
+                               append_string "warn" "pingperiod cannot be greater than $period. Defaulted to $pingperiod_default seconds (1/5 of period)" "; "
+                       fi
 
-               local ping_period_default="$((period / 5))"
-
-               if [ -z "$ping_period" ]; then
-                       ping_period="$ping_period_default"
-                       append_string "warn" "ping_period is not configured! Defaulted to $ping_period seconds(1/5 of period)" "; "
-               else
-                       time_to_seconds "$ping_period"
-                       ping_period="$seconds"
-                       [ "$ping_period" -ge 0 -a "$ping_period" -ge "$period" ] && {
-                               ping_period="$ping_period_default"
-                               append_string "warn" "ping_period is invalid value(greater than period)! Defaulted to $ping_period seconds(1/5 of period)" "; "
-                       }
-                       [ "$ping_period" -ge 0 ] || {
-                               ping_period="$ping_period_default"
-                               append_string "warn" "ping_period has invalid format! Use time value(ex: '30'; '4m'; '6h'; '2d'). Defaulted to $ping_period seconds(1/5 of period)" "; "
-                       }
+                       if [ "$pingperiod" -lt 0 ]; then
+                               append_string "warn" "pingperiod cannot be a negative value." "; "
+                       fi
+
+                       if [ "$mmifacename" != "" ] && [ "$period" -lt 30 ]; then
+                               append_string "error" "Check interval is less than 30s. For robust operation with ModemManager modem interfaces it is recommended to set the period to at least 30s."
+                       fi
                fi
-       }
+       fi
+
+       # ping_reboot mode and periodic_reboot mode specific checks
+       if [ "$mode" = "ping_reboot" ] || [ "$mode" = "periodic_reboot" ]; then
+               forcedelay="$(time_to_seconds "$forcedelay")"
+       fi
 
        [ -n "$warn" ] && logger -p user.warn -t "watchcat" "$1: $warn"
        [ -n "$error" ] && {
@@ -111,18 +93,22 @@ load_watchcat() {
 
        case "$mode" in
        periodic_reboot)
-               /usr/bin/watchcat.sh "periodic_reboot" "$period" "$force_delay" &
-               logger -p user.info -t "watchcat" "started task (mode=$mode;period=$period;force_delay=$force_delay)"
+               /usr/bin/watchcat.sh "periodic_reboot" "$period" "$forcedelay" &
+               logger -p user.info -t "watchcat" "started task (mode=$mode;period=$period;forcedelay=$forcedelay)"
                ;;
        ping_reboot)
-               /usr/bin/watchcat.sh "ping_reboot" "$period" "$force_delay" "$ping_hosts" "$ping_period" "$no_ping_time" "$ping_size" &
-               logger -p user.info -t "watchcat" "started task (mode=$mode;period=$period;ping_hosts=$ping_hosts;ping_period=$ping_period;force_delay=$force_delay;no_ping_time=$no_ping_time;ping_size=$ping_size)"
+               /usr/bin/watchcat.sh "ping_reboot" "$period" "$forcedelay" "$pinghosts" "$pingperiod" "$pingsize" &
+               logger -p user.info -t "watchcat" "started task (mode=$mode;period=$period;pinghosts=$pinghosts;pingperiod=$pingperiod;forcedelay=$forcedelay;pingsize=$pingsize)"
+               ;;
+       restart_iface)
+               /usr/bin/watchcat.sh "restart_iface" "$period" "$pinghosts" "$pingperiod" "$pingsize" "$interface" "$mmifacename" &
+               logger -p user.info -t "watchcat" "started task (mode=$mode;period=$period;pinghosts=$pinghosts;pingperiod=$pingperiod;pingsize=$pingsize;interface=$interface;mmifacename=$mmifacename;unlockbands=$unlockbands)"
                ;;
        *)
                echo "Error starting Watchcat service. Invalid mode selection: $mode"
                ;;
        esac
-       
+
        echo $! >>"${PIDFILE}.pids"
 }