Skip to content

161 improve verbose mode #162

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
daniel-santos wants to merge 3 commits into
base: master
Choose a base branch
from
Open

161 improve verbose mode #162

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7d26f8
Fix cmd line too long
daniel-santos May 27, 2025
d2a37c8
Dump curl data and command line in verbose_mode
daniel-santos May 27, 2025
0cbad94
Merge branch 'master' into 161-improve-verbose-mode
nemesifier Dec 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions openwisp-monitoring/files/monitoring.agent
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,7 @@ send_data() {
fi
filename="$TMP_DIR/$filename"
# check if the data file exist
if [ -f "$filename" ]; then
data=$(cat "$filename")
else
if ! [ -f "$filename" ]; then
[ "$VERBOSE_MODE" -eq "1" ] && logger -s "data file $filename not found." \
-p daemon.info
continue
Expand All @@ -176,7 +174,13 @@ send_data() {
break
fi
# send data
response_code=$($CURL_COMMAND -H "Content-Type: application/json" -d "$data" "$url")
if [ "$VERBOSE_MODE" -eq "1" ]; then
printf "data="
cat "$filename"
set -x
fi
response_code=$($CURL_COMMAND -H "Content-Type: application/json" -d "@$filename" "$url")
set +x
Comment on lines 176 to +183
Copy link
Copy Markdown

@coderabbitai coderabbitai Bot Jan 22, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue | 🟡 Minor

Guard xtrace toggling to avoid disabling external debugging.

set +x runs even when VERBOSE_MODE=0, which can unexpectedly disable xtrace enabled by the caller. Gate the disable to verbose mode only.

🔧 Proposed fix 
-				if [ "$VERBOSE_MODE" -eq "1" ]; then
-					printf "data="
-					cat "$filename"
-					set -x
-				fi
-				response_code=$($CURL_COMMAND -H "Content-Type: application/json" -d "@$filename" "$url")
-				set +x
+				if [ "$VERBOSE_MODE" -eq "1" ]; then
+					printf "data="
+					cat "$filename"
+					set -x
+				fi
+				response_code=$($CURL_COMMAND -H "Content-Type: application/json" -d "@$filename" "$url")
+				if [ "$VERBOSE_MODE" -eq "1" ]; then
+					set +x
+				fi
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
# send data
response_code=$($CURL_COMMAND -H "Content-Type: application/json" -d "$data" "$url")
if [ "$VERBOSE_MODE" -eq "1" ]; then
printf "data="
cat "$filename"
set -x
fi
response_code=$($CURL_COMMAND -H "Content-Type: application/json" -d "@$filename" "$url")
set +x
# send data
if [ "$VERBOSE_MODE" -eq "1" ]; then
printf "data="
cat "$filename"
set -x
fi
response_code=$($CURL_COMMAND -H "Content-Type: application/json" -d "@$filename" "$url")
if [ "$VERBOSE_MODE" -eq "1" ]; then
set +x
fi
🤖 Prompt for AI Agents 
In `@openwisp-monitoring/files/monitoring.agent` around lines 176 - 183, The
script unconditionally runs "set +x" which can turn off caller-enabled xtrace;
modify the verbose block that currently does "if [ "$VERBOSE_MODE" -eq "1" ];
then ... set -x fi" so that the corresponding "set +x" is executed only when
VERBOSE_MODE is 1 — i.e., wrap or move the "set +x" into the same conditional
that prints the data and runs "set -x" (refer to the VERBOSE_MODE check, the
printf/cat section, and the set -x/set +x invocations) so external xtrace is not
disabled when VERBOSE_MODE is 0.

if [ "$response_code" = "200" ]; then
success=$((success + 1))
if [ "$VERBOSE_MODE" -eq "1" ]; then
Expand Down