From f0121bcb4ae0315c8635ba310906d10a8de48a10 Mon Sep 17 00:00:00 2001 From: Russel Yasol Date: Sat, 18 Jan 2025 06:46:00 +0800 Subject: [PATCH] Fixed QuecManager Services and removed deprecated change_sms script. --- .../root/etc/init.d/quecmanager-services | 19 ++++------ .../root/www/cgi-bin/quecmanager-services | 37 ------------------ .../www/cgi-bin/services/change_sms_code.sh | 38 ------------------- 3 files changed, 8 insertions(+), 86 deletions(-) delete mode 100644 ipk-source/sdxpinn-quecmanager-beta/root/www/cgi-bin/quecmanager-services delete mode 100644 ipk-source/sdxpinn-quecmanager-beta/root/www/cgi-bin/services/change_sms_code.sh diff --git a/ipk-source/sdxpinn-quecmanager-beta/root/etc/init.d/quecmanager-services b/ipk-source/sdxpinn-quecmanager-beta/root/etc/init.d/quecmanager-services index 980ea71..ee9d723 100755 --- a/ipk-source/sdxpinn-quecmanager-beta/root/etc/init.d/quecmanager-services +++ b/ipk-source/sdxpinn-quecmanager-beta/root/etc/init.d/quecmanager-services @@ -1,12 +1,15 @@ #!/bin/sh /etc/rc.common - -START=99 +START=49 STOP=10 - USE_PROCD=1 start_service() { - # echo "Starting QuecManager services" + # Run clear_logs.sh once without procd management + echo "Running clear_logs.sh" + /www/cgi-bin/services/clear_logs.sh + echo "clear_logs.sh complete" + + # Start the continuously running services procd_open_instance procd_set_param command /www/cgi-bin/services/log_signal_metrics.sh procd_set_param respawn @@ -21,12 +24,6 @@ start_service() { procd_set_param stderr 1 procd_close_instance - procd_open_instance - procd_set_param command /www/cgi-bin/services/clear_logs.sh - procd_set_param respawn - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_close_instance echo "Signal Metrics Logger Running" echo "All QuecManager services Running" } @@ -34,4 +31,4 @@ start_service() { stop_service() { # procd will handle stopping all instances automatically echo "Stopping QuecManager services." -} \ No newline at end of file +} diff --git a/ipk-source/sdxpinn-quecmanager-beta/root/www/cgi-bin/quecmanager-services b/ipk-source/sdxpinn-quecmanager-beta/root/www/cgi-bin/quecmanager-services deleted file mode 100644 index ca2ebf8..0000000 --- a/ipk-source/sdxpinn-quecmanager-beta/root/www/cgi-bin/quecmanager-services +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh /etc/rc.common - -START=99 -STOP=10 - -USE_PROCD=1 - -start_service() { - # echo "Starting QuecManager services" - procd_open_instance - procd_set_param command /www/cgi-bin/services/log_signal_metrics.sh - procd_set_param respawn - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_close_instance - - procd_open_instance - procd_set_param command /www/cgi-bin/services/at_queue_processor.sh - procd_set_param respawn - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_close_instance - - procd_open_instance - procd_set_param command /www/cgi-bin/services/clear_logs.sh - procd_set_param respawn - procd_set_param stdout 1 - procd_set_param stderr 1 - procd_close_instance - echo "Signal Metrics Logger Running" - echo "All QuecManager services Running" -} - -stop_service() { - # procd will handle stopping all instances automatically - echo "Stopping QuecManager services." -} diff --git a/ipk-source/sdxpinn-quecmanager-beta/root/www/cgi-bin/services/change_sms_code.sh b/ipk-source/sdxpinn-quecmanager-beta/root/www/cgi-bin/services/change_sms_code.sh deleted file mode 100644 index d6889ac..0000000 --- a/ipk-source/sdxpinn-quecmanager-beta/root/www/cgi-bin/services/change_sms_code.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# Script for SMS initialization and initial fetch -# Check if atinout and jq are installed -if ! command -v atinout &> /dev/null || ! command -v jq &> /dev/null; then - echo "Error: Required tools (atinout or jq) are not installed" - exit 1 -fi - -# Check if the device exists -if [ ! -c "/dev/smd7" ]; then - echo "Error: Device /dev/smd7 not found" - exit 1 -fi - -# Set SMS text mode -if ! echo "AT+CMGF=1" | atinout - /dev/smd7 -; then - echo "Error: Failed to set SMS text mode" - exit 1 -fi - -# Wait for 2 seconds -sleep 2 - -# Fetch initial SMS messages -if ! echo "AT+CMGL=\"ALL\"" | atinout - /dev/smd7 - | jq -R -s ' - split("\n") | - map(select(length > 0)) | - map( - select(startswith("+CMGL:") or (. != "OK" and . != "ERROR")) - ) | - {messages: .} -' > /tmp/sms_inbox.json; then - echo "Error: Failed to fetch SMS messages" - exit 1 -fi - -# Exit successfully -exit 0 \ No newline at end of file