diff --git a/ipk-source/sdxpinn-quecmanager-beta/CONTROL/conffiles b/ipk-source/sdxpinn-quecmanager-beta/CONTROL/conffiles deleted file mode 100755 index 8d22bf5..0000000 --- a/ipk-source/sdxpinn-quecmanager-beta/CONTROL/conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/quecManager.conf diff --git a/ipk-source/sdxpinn-quecmanager-beta/CONTROL/control b/ipk-source/sdxpinn-quecmanager-beta/CONTROL/control index 0126050..685ec8d 100755 --- a/ipk-source/sdxpinn-quecmanager-beta/CONTROL/control +++ b/ipk-source/sdxpinn-quecmanager-beta/CONTROL/control @@ -1,7 +1,7 @@ Package: sdxpinn-quecmanager-beta -Version: 1.1.0-6 +Version: 1.1.1 Architecture: aarch64_cortex-a53 Maintainer: Russel Yasol dr-dolomite@github.com Cameron Thompson iamromulan@github.com Description: A custom web UI desgined to run alongside luci for Quectel RM55x modems -Depends: libc uhttpd sdxpinn-mount-fix atinout jq ookla-speedtest -Conflicts: sdxpinn-quecmanager \ No newline at end of file +Depends: sdxpinn-mount-fix, libc, coreutils-timeout, uhttpd, sms-tool, jq, ookla-speedtest +Conflicts: sdxpinn-quecmanager diff --git a/ipk-source/sdxpinn-quecmanager-beta/CONTROL/preinst b/ipk-source/sdxpinn-quecmanager-beta/CONTROL/preinst index ea1d4ee..f69aeef 100755 --- a/ipk-source/sdxpinn-quecmanager-beta/CONTROL/preinst +++ b/ipk-source/sdxpinn-quecmanager-beta/CONTROL/preinst @@ -39,6 +39,9 @@ for SCRIPT in $SCRIPTS; do fi done +service quecmanager-services stop +service quecmanager-services disable + echo "Cleanup complete." exit 0 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 ccf1f9c..a02e3d8 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,23 +1,37 @@ #!/bin/sh /etc/rc.common - START=49 STOP=10 - USE_PROCD=1 start_service() { - echo "Starting QuecManager services" - echo "Executed" - echo "Starting Signal Metrics Logger" - # Start Signal Metrics Logger + # Run clear_logs.sh once without procd management, with a timeout + echo "Clearing QuecManager Logs" + timeout 5 /www/cgi-bin/services/clear_logs.sh + if [ $? -eq 124 ]; then + echo "clear_logs.sh timed out after 5 seconds" + else + echo "Log Cleaner complete" + fi + + # Start the continuously running services + echo "Starting AT Command Queue Processor..." 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_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 - echo "Signal Metrics Logger Running" - echo "All QuecManager services Running" + echo "AT Queue Processor Started" + echo "Starting Signal Metrics Logger..." + 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 + echo "Signal Metrics Logger started" + + echo "All QuecManager services Started" } stop_service() { diff --git a/ipk-source/sdxpinn-quecmanager-beta/root/etc/quecManager.conf b/ipk-source/sdxpinn-quecmanager-beta/root/etc/quecManager.conf deleted file mode 100644 index e0e7f28..0000000 --- a/ipk-source/sdxpinn-quecmanager-beta/root/etc/quecManager.conf +++ /dev/null @@ -1,4 +0,0 @@ -AT_port = dev/smd11 -AT_port_custom = dev/smd7 -data_refresh_rate = 5000 -# end of config (don't remove this line) diff --git a/ipk-source/sdxpinn-quecmanager-beta/root/www/404.html b/ipk-source/sdxpinn-quecmanager-beta/root/www/404.html index 0bb930b..6ffc98e 100644 --- a/ipk-source/sdxpinn-quecmanager-beta/root/www/404.html +++ b/ipk-source/sdxpinn-quecmanager-beta/root/www/404.html @@ -1 +1 @@ -
Enter your password to login
Enter your password to login