[refactor] Minor changes

Author: devkapilbansal

openwisp-monitoring/files/monitoring.agent

@@ -85,7 +85,7 @@ check_available_memory() {
 			if [ -f "$file" ]; then
 				rm "$file"
 			else
-				log -w -v "Not enough memory available, skipping collect data."
+				log -w -n "Not enough memory available, skipping collect data."
 				return 1
 			fi
 		fi
@@ -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 4 ] && 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 again in $INTERVAL seconds."
 				trap handle_sigusr1 USR1
 				# SIGUSR1 signal received, interrupt sleep and continue sending data
 				sleep "$INTERVAL" &
@@ -307,9 +307,9 @@ main() {
 	done
 
 	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')"
+	REGISTRATION_INTERVAL=$((INTERVAL / 10))
 	VERBOSE_MODE=${VERBOSE_MODE:-0}
 	BOOTUP_DELAY=${BOOTUP_DELAY:-10}
 	TMP_DIR="/tmp/openwisp/monitoring"