[chores] Improve log messages and use log util in all agent logs

Author: devkapilbansal

openwisp-monitoring/files/monitoring.agent

@@ -98,7 +98,7 @@ collect_data() {
 	until [ "$n" -ge 5 ]; do
 		/usr/sbin/netjson-monitoring --dump "$MONITORED_INTERFACES" && break
 
-		[ "$n" -eq 5 ] && log -e -v "Collecting data failed!"
+		[ "$n" -eq 5 ] && log -e -v "Collecting data failed!."
 		n=$((n + 1))
 		sleep 5
 	done
@@ -149,7 +149,7 @@ send_data() {
 	while true; do
 		for file in "$TMP_DIR"/*; do
 			if [ ! -f "$file" ]; then
-				log -i -v "No data file found to send. Checking after $INTERVAL seconds"
+				log -i -v "No data file found to send. Checking after $INTERVAL seconds."
 				trap handle_sigusr1 USR1
 				# SIGUSR1 signal received, interrupt sleep and continue sending data
 				sleep "$INTERVAL" &
@@ -200,9 +200,7 @@ send_data() {
 					rm -f "$filename"
 					break
 				elif [ "$response_code" = "400" ]; then
-					logger -s "Data not sent successfully (HTTP status $response_code), discarding data." \
-						-t openwisp-monitoring \
-						-p daemon.err
+					log -i -n "Data not sent successfully (HTTP status $response_code), discarding data."
 					rm -f "$filename"
 					break
 				else
@@ -222,17 +220,13 @@ wait_until_registered() {
 	if [ -n "$UUID" ] && [ -n "$KEY" ]; then
 		return 0
 	fi
-	logger -s "Waiting for device to register." \
-		-t openwisp-monitoring \
-		-p daemon.info
+	log -i -n "Waiting for device to register."
 	UUID=$(uci get openwisp.http.uuid 2>/dev/null)
 	KEY=$(uci get openwisp.http.key 2>/dev/null)
 	if [ -z "$UUID" ] || [ -z "$KEY" ]; then
 		return 1
 	fi
-	logger -s "Setting uuid and key." \
-		-t openwisp-monitoring \
-		-p daemon.info
+	log -i -n "Setting uuid and key."
 	export UUID KEY
 }
 
@@ -242,9 +236,7 @@ bootup_delay() {
 		if [ "$BOOTUP_DELAY" -ne "0" ]; then
 			# get a random number between zero and $BOOTUP_DELAY
 			DELAY=$(/usr/sbin/openwisp-get-random-number 0 "$BOOTUP_DELAY")
-			logger "Delaying initialization of the monitoring agent for $DELAY seconds." \
-				-t openwisp-monitoring \
-				-p daemon.info
+			log -i -n "Delaying initialization of the monitoring agent for $DELAY seconds."
 			sleep "$DELAY"
 		fi
 		# send bootup hotplug event
@@ -307,7 +299,7 @@ main() {
 				shift
 				;;
 			-*)
-				echoerr "Invalid option: $1"
+				echoerr "Invalid option: $1."
 				;;
 			*) break ;;
 		esac
@@ -345,7 +337,7 @@ main() {
 		RESPONSE_FILE="$TMP_DIR"/response.txt
 		set_url_and_curl && send_data
 	else
-		echoerr "The supplied mode is invalid. Only send and collect are allowed"
+		echoerr "The supplied mode is invalid. Only send and collect are allowed."
 	fi
 }
 

openwisp-monitoring/files/monitoring.init

@@ -61,11 +61,11 @@ start_service() {
 	procd_set_param respawn "${respawn_threshold:-3600}" "${respawn_timeout:-5}" "${respawn_retry:-5}"
 	procd_close_instance
 
-	logger -s "$PROG_NAME started" -t openwisp-monitoring -p daemon.info
+	logger -s "$PROG_NAME started." -t openwisp-monitoring -p daemon.info
 }
 
 stop_service() {
-	logger -s "$PROG_NAME stopping" -t openwisp-monitoring -p daemon.info
+	logger -s "$PROG_NAME stopping." -t openwisp-monitoring -p daemon.info
 }
 
 service_triggers() {