Merge branch 'master' into issues/57-move-logger-call-in-subroutine

Author: devkapilbansal

openwisp-monitoring/files/monitoring.agent

@@ -66,7 +66,7 @@ time_to_seconds() {
 		|| { [ "${time%h}" -ge 1 ] 2>/dev/null && seconds=$((${time%h} * 3600)); } \
 		|| { [ "${time%d}" -ge 1 ] 2>/dev/null && seconds=$((${time%d} * 86400)); }
 
-	echo $seconds
+	echo "$seconds"
 	unset seconds
 	unset time
 }
@@ -100,7 +100,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
@@ -181,8 +181,7 @@ send_data() {
 			if [ -f "$filename" ]; then
 				data=$(cat "$filename")
 			else
-				[ "$VERBOSE_MODE" -eq "1" ] && logger -s "data file $filename not found." \
-					-p daemon.info
+				log -i -v "data file $filename not found."
 				continue
 			fi
 			while true; do
@@ -201,6 +200,7 @@ send_data() {
 				# send data
 				response_code=$($CURL_COMMAND -H "Content-Type: application/json" -d "$data" "$url")
 				if [ "$response_code" = "200" ]; then
+					success=$((success + 1))
 					log -i -v "Data sent successfully."
 					# check if agent was already failing or not to avoid repeating log messages
 					if [ "$FAILING" -eq "1" ]; then
@@ -224,9 +224,7 @@ send_data() {
 						# Controller. We check if openwisp-config agent is running to determine if the device has been
 						# deleted. If openwisp-config agent is not running, the monitoring agent will also exit.
 						if ! pgrep -x "openwisp-config" >/dev/null; then
-							logger -s "Giving up and shutting down: the device may have been deleted from OpenWISP Controller" \
-								-t openwisp-monitoring \
-								-p daemon.err
+							log -e -n "Giving up and shutting down: the device may have been deleted from OpenWISP Controller"
 							# get process id of the process collecting data
 							pid=$(pgrep -f "openwisp-monitoring.*--mode collect")
 							kill -SIGKILL "$pid"