[chores] Fix message getting logged twice and minor improvements

openwisp · Aug 19, 2021 · 75ddd0f · 75ddd0f
1 parent 623ca63
commit 75ddd0f
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/openwrt-openwisp-monitoring/files/monitoring.agent b/openwrt-openwisp-monitoring/files/monitoring.agent
@@ -131,9 +131,9 @@ send_data() {
         trap handle_sigusr1 USR1
         # SIGUSR1 signal received, interrupt sleep and continue sending data
         sleep "$INTERVAL" & wait $!
-        trap "" USR1
         continue
       fi
+      trap "" USR1
       basefilename=${file##*/}
       filename=${basefilename%.*}
       # extra zeroes are added for nanoseconds precision
@@ -159,9 +159,7 @@ send_data() {
         fi
         # send data
         data=$(cat "$file")
-        response_code=$($CURL_COMMAND -H "Content-Type: application/json" \
-          -d "$data" \
-          -v "$url")
+        response_code=$($CURL_COMMAND -H "Content-Type: application/json" -d "$data" "$url")
         if [ "$response_code" = "200" ]; then
           if [ "$verbose_mode" -eq "1" ]; then
             logger -s "Data sent successfully." \
@@ -172,7 +170,7 @@ send_data() {
                    -p daemon.info
             FAILING=0
           fi
-          #remove saved data 
+          # remove saved data
           rm "$file"
           break
         else