[refactor] Refactor init script

Author: devkapilbansal

openwisp-monitoring/files/monitoring.agent

@@ -55,6 +55,20 @@ log() {
 	logger -s "$@" -p "$level" -t openwisp-monitoring
 }
 
+time_to_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
+}
+
 check_available_memory() {
 	while true; do
 		total=$(ubus call system info | jsonfilter -e '@.memory.total')
@@ -302,6 +316,8 @@ main() {
 
 	INTERVAL=${INTERVAL:-300}
 	REGISTRATION_INTERVAL=$((INTERVAL / 10))
+	INTERVAL="$(time_to_seconds "$INTERVAL")"
+	[ -z "$INTERVAL" ] && echoerr "Interval is invalid. Use time value(eg: '10', '2m', '3h', '1d')"
 	VERBOSE_MODE=${VERBOSE_MODE:-0}
 	BOOTUP_DELAY=${BOOTUP_DELAY:-10}
 	TMP_DIR="/tmp/openwisp/monitoring"

openwisp-monitoring/files/monitoring.init

@@ -4,75 +4,60 @@
 
 # shellcheck disable=SC2034
 START=99
-STOP=15
+
 USE_PROCD=1
 PROG="/usr/sbin/openwisp-monitoring"
 PROG_NAME="OpenWISP monitoring daemon"
 
-time_to_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)); }
+add_option() {
+	# shellcheck disable=SC3043
+	{
+		local cfg="$1"
+		local flag="$2"
+		local option="$3"
+		local default="$4"
+		local value
+	}
 
-	echo $seconds
-	unset seconds
-	unset time
+	config_get value "$cfg" "$option" "$default"
+	[ -n "$value" ] && procd_append_param command "$flag" "$value"
 }
 
 start_service() {
 	# for openwisp-config
 	config_load openwisp
-	config_get base_url http url
-	config_get uuid http uuid
-	config_get key http key
-	config_get_bool verify_ssl http verify_ssl "1"
-	config_get respawn_threshold http respawn_threshold
-	config_get respawn_timeout http respawn_timeout
-	config_get respawn_retry http respawn_retry
-
-	[ -n "$base_url" ] && base_url="--url $base_url"
-	[ -n "$uuid" ] && uuid="--uuid $uuid"
-	[ -n "$key" ] && key="--key $key"
-	[ -n "$verify_ssl" ] && verify_ssl="--verify_ssl $verify_ssl"
-
-	if [ -z "$base_url" ]; then
-		logger -s "url is not set, please add it to /etc/config/openwisp" \
-			-t openwisp-monitoring \
-			-p daemon.err
-		exit 1
-	fi
-
-	# for openwisp-monitoring
+
+	respawn_threshold=$(config_get http respawn_threshold)
+	respawn_timeout=$(config_get http respawn_timeout)
+	respawn_retry=$(config_get http respawn_retry)
+
+	procd_open_instance "openwisp-monitoring_send_data"
+	procd_set_param command $PROG
+
+	add_option "http" "--url" url
+	add_option "http" "--uuid" uuid
+	add_option "http" "--key" key
+	add_option "http" "--verify_ssl" verify_ssl "1"
+
 	config_load openwisp-monitoring
-	config_get monitored_interfaces monitoring monitored_interfaces "*"
-	config_get interval monitoring interval "300"
-	config_get_bool verbose_mode monitoring verbose_mode "0"
-	config_get required_memory monitoring required_memory "0.05"
-	config_get max_retries monitoring max_retries "5"
-	config_get bootup_delay monitoring bootup_delay "10"
-
-	interval="$(time_to_seconds "$interval")"
-	[ -z "$interval" ] && { echo "Interval is invalid. Use time value(eg: '10', '2m', '3h', '1d')" 1>&2 && exit 1; }
-
-	interval="--interval $interval"
-	verbose="--verbose_mode ${verbose_mode:-0}"
-	required_memory="--required_memory $required_memory"
-	max_retries="--max_retries $max_retries"
-	bootup_delay="--bootup_delay $bootup_delay"
 
-	procd_open_instance "openwisp-monitoring_collect_data"
-	# shellcheck disable=SC2086,SC2154
-	procd_set_param command $PROG $interval $verbose $required_memory --mode collect --monitored_interfaces "$monitored_interfaces"
+	add_option "monitoring" "--verbose_mode" verbose_mode "0"
+	add_option "monitoring" "--max_retries" max_retries "5"
+	add_option "monitoring" "--interval" interval "300"
+	procd_append_param command "--mode" "send"
+
 	procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
 	procd_close_instance
 
-	procd_open_instance "openwisp-monitoring_send_data"
-	# shellcheck disable=SC2086
-	procd_set_param command $PROG $base_url $uuid $key $verify_ssl $interval $verbose $max_retries $bootup_delay --mode send
+	procd_open_instance "openwisp-monitoring_collect_data"
+	procd_set_param command $PROG
+
+	add_option "monitoring" "--monitored_interfaces" monitored_interfaces "*"
+	add_option "monitoring" "--required_memory" required_memory "0.05"
+	add_option "monitoring" "--verbose_mode" verbose_mode "0"
+	add_option "monitoring" "--interval" interval "300"
+	procd_append_param command "--mode" "collect"
+
 	procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
 	procd_close_instance