tyk/quectel-rgmii-toolkit
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Release version for 1.1.1-2

Browse Source 
- Improved fetch_data script
- Improved quecwatch script
- Added scripts for cell scan
- Added a working UI for cell scan
This commit is contained in:
Russel Yasol
2025-01-23 20:17:02 +08:00
parent f2a451e862
commit cf9387c736
66 changed files with 37772 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
ipk-source/sdxpinn-quecmanager-beta/root/www/cgi-bin/services/log_signal_metrics.sh
View File

@@ -4,35 +4,13 @@ LOGDIR="/www/signal_graphs"
MAX_ENTRIES=10
INTERVAL=60
QUEUE_FILE="/tmp/at_pipe.txt"
FETCH_LOCK_KEYWORD="FETCH_LOCK"
CELL_SCAN_KEYWORD="CELL_SCAN" # Added to check for cell scan
AT_COMMAND_KEYWORD="AT_COMMAND_LOCK"
CELL_SCAN_KEYWORD="CELL_SCAN" # Added to check for cell scan
PAUSE_FILE="/tmp/signal_logging.pause"
# Ensure the directory exists
mkdir -p "$LOGDIR"
# Check for stale entries and clean them
check_and_clean_stale() {
local command_type="$1"
local wait_count=0
while [ $wait_count -lt 6 ]; do
# Check if our type of entry exists
if grep -q "\"command\":\"${command_type}\"" "$QUEUE_FILE"; then
sleep 1
wait_count=$((wait_count + 1))
else
# Entry is gone, we can proceed
return 0
fi
done
# If we get here, entry is stale - remove it
logger -t signal_metrics "Removing stale ${command_type} entry after ${wait_count}s"
sed -i "/\"command\":\"${command_type}\"/d" "$QUEUE_FILE"
return 0
}
# Wait for high-priority operations
wait_for_high_priority() {
while grep -q "\"priority\":\"high\"" "$QUEUE_FILE"; do
@@ -41,49 +19,77 @@ wait_for_high_priority() {
done
}
# Simplified lock handling with priority awareness
# Enhanced lock handling with better priority awareness
handle_lock() {
# Wait for any high-priority operations first
wait_for_high_priority
# Check and clean any FETCH_LOCK entries
# Check for any CGI script operations (high priority)
while grep -q "\"priority\":\"high\"" "$QUEUE_FILE" ||
grep -q "\"command\":\"$AT_COMMAND_KEYWORD\"" "$QUEUE_FILE"; do
logger -t signal_metrics "Waiting for high-priority CGI operation to complete"
sleep 2
done
# Check and clean any stale FETCH_LOCK entries
check_and_clean_stale "FETCH_LOCK"
# Check for cell scan operations
while grep -q "\"command\":\"$CELL_SCAN_KEYWORD\"" "$QUEUE_FILE"; do
logger -t signal_metrics "Waiting for cell scan to complete"
sleep 1
done
# Add our low-priority entry
printf '{"command":"AT_COMMAND","pid":"%s","timestamp":"%s","priority":"low"}\n' \
"$$" \
"$(date '+%H:%M:%S')" >>"$QUEUE_FILE"
# Then check and clean our own entry if it gets stuck
check_and_clean_stale "AT_COMMAND"
}
# Increase the wait time for stale entry checking
check_and_clean_stale() {
local command_type="$1"
local wait_count=0
while [ $wait_count -lt 10 ]; do # Increased from 6 to 10
# Check if our type of entry exists
if grep -q "\"command\":\"${command_type}\"" "$QUEUE_FILE"; then
sleep 2 # Increased from 1 to 2
wait_count=$((wait_count + 1))
else
# Entry is gone, we can proceed
return 0
fi
done
# Only clean low-priority entries
if ! grep -q "\"priority\":\"high\".*\"command\":\"${command_type}\"" "$QUEUE_FILE"; then
logger -t signal_metrics "Removing stale ${command_type} entry after ${wait_count}s"
sed -i "/\"command\":\"${command_type}\"/d" "$QUEUE_FILE"
fi
return 0
}
# Clean output function
clean_output() {
local output=""
read -r line
while read -r line; do
case "$line" in
"OK" | "")
continue
;;
*)
if [ -n "$output" ]; then
output="$output\\n$line"
else
output="$line"
fi
;;
"OK" | "")
continue
;;
*)
if [ -n "$output" ]; then
output="$output\\n$line"
else
output="$line"
fi
;;
esac
done
echo "$output"
}
@@ -92,25 +98,54 @@ execute_at_command() {
local COMMAND="$1"
handle_lock
local OUTPUT=$(sms_tool at "$COMMAND" -t 4 2>/dev/null | clean_output)
sed -i "/\"pid\":\"$$\"/d" "$QUEUE_FILE" # Remove our entry
sed -i "/\"pid\":\"$$\"/d" "$QUEUE_FILE" # Remove our entry
echo "$OUTPUT"
}
# Log signal metric
# Log signal metric with response validation
log_signal_metric() {
[ -f "$PAUSE_FILE" ] && return
local COMMAND="$1"
local FILENAME="$2"
local EXPECTED_RESPONSE="$3" # New parameter for expected response content
local LOGFILE="$LOGDIR/$FILENAME"
mkdir -p "$(dirname "$LOGFILE")"
local TIMESTAMP=$(date "+%Y-%m-%d %H:%M:%S")
local SIGNAL_OUTPUT=$(execute_at_command "$COMMAND")
# Validate response based on command type
case "$COMMAND" in
"AT+QRSRP")
if ! echo "$SIGNAL_OUTPUT" | grep -q "QRSRP"; then
logger -t signal_metrics "Invalid RSRP response: $SIGNAL_OUTPUT"
return 1
fi
;;
"AT+QRSRQ")
if ! echo "$SIGNAL_OUTPUT" | grep -q "QRSRQ"; then
logger -t signal_metrics "Invalid RSRQ response: $SIGNAL_OUTPUT"
return 1
fi
;;
"AT+QSINR")
if ! echo "$SIGNAL_OUTPUT" | grep -q "QSINR"; then
logger -t signal_metrics "Invalid SINR response: $SIGNAL_OUTPUT"
return 1
fi
;;
"AT+QGDCNT?;+QGDNRCNT?")
if ! echo "$SIGNAL_OUTPUT" | grep -q "QGDCNT\|QGDNRCNT"; then
logger -t signal_metrics "Invalid data usage response: $SIGNAL_OUTPUT"
return 1
fi
;;
esac
[ ! -s "$LOGFILE" ] && echo "[]" >"$LOGFILE"
if [ -n "$SIGNAL_OUTPUT" ]; then
local TEMP_FILE="${LOGFILE}.tmp.$$"
if jq --arg dt "$TIMESTAMP" \
@@ -129,9 +164,9 @@ log_signal_metric() {
start_continuous_logging() {
sleep 20
logger -t signal_metrics "Starting continuous signal metrics logging (PID: $$)"
trap 'logger -t signal_metrics "Stopping signal metrics logging"; exit 0' INT TERM
while true; do
if [ ! -f "$PAUSE_FILE" ]; then
log_signal_metric "AT+QRSRP" "rsrp.json"