From a1044ecaba4b1a1dc87f2ea45bf1a6f1f3552426 Mon Sep 17 00:00:00 2001 From: Stefal Date: Mon, 26 Aug 2024 10:37:48 +0200 Subject: [PATCH 1/7] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7af7cd3..c22f879 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ - More tests before installing prebuilt RTKLib cli tools. ### Fixed - Build rtklib if previous installed release is not working. #418 - - Insert new release into settings.conf before restarting services. #411 + - Insert new release number into settings.conf before restarting services. #411 - Custom web_port setting was not used. #419 - Cellular modem: nmcli connection was not updated after a switch to public ip address. From 1f405db4f69f82522e270c18d7467baa1483b8bc Mon Sep 17 00:00:00 2001 From: Stefal Date: Sat, 5 Oct 2024 20:06:54 +0200 Subject: [PATCH 2/7] Raise up the reboot refresh countdown. Fix #426 --- web_app/static/settings.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_app/static/settings.js b/web_app/static/settings.js index c63e6e3..9f48006 100644 --- a/web_app/static/settings.js +++ b/web_app/static/settings.js @@ -714,7 +714,7 @@ $(document).ready(function () { $(this).prop("disabled", true); $("#reboot-cancel-button").prop("disabled", true); socket.emit("reboot device"); - reboot_countdown(60, 0); + reboot_countdown(90, 0); }) function reboot_countdown(remaining, count) { From bb0128730f1906ebd9483a936a1c758290d50484 Mon Sep 17 00:00:00 2001 From: Stefal Date: Sat, 5 Oct 2024 21:04:48 +0200 Subject: [PATCH 3/7] Fix #436 --- CHANGELOG.md | 4 ++++ settings.conf.default | 2 +- tools/rtkbase_update.sh | 18 ++++++++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c22f879..2501839 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [2.6.2] - Unreleased +### Fixed + - Remove firstboot service on Raspberry Pi image >= 2.5 which was causing services to stay stopped after a reboot. #436 + - Autorefresh timeout is now 90s. #426 ## [2.6.1] - 2024-08-26 ### Changed - More tests before installing prebuilt RTKLib cli tools. diff --git a/settings.conf.default b/settings.conf.default index b50e2e4..e806217 100644 --- a/settings.conf.default +++ b/settings.conf.default @@ -2,7 +2,7 @@ [general] # Version -version=2.6.1 +version=2.6.2 # Rtkbase upgrade mandatory "checkpoint" checkpoint_version=2.7.0 # User who runs str2str_file service diff --git a/tools/rtkbase_update.sh b/tools/rtkbase_update.sh index 4dcc46e..47c48cb 100755 --- a/tools/rtkbase_update.sh +++ b/tools/rtkbase_update.sh @@ -207,6 +207,24 @@ upd_2.6.0() { then "${destination_directory}"/tools/install.sh --user "${standard_user}" --rtklib fi + upd_2.6.1 "$@" +} + +upd_2.6.1() { + #Remove firstboot service from the Raspberry 2.5 and 2.6 images + #This service should have been removed after the first boot, but + # wasn't and was stopping various RTKBase services at each boot. + if [[ -f /etc/os-release ]] + then + source /etc/os-release + fi + + if [[ $ID == debian ]] && systemctl list-units firstboot.service + then + systemctl disable --now firstboot.service + rm /lib/systemd/system/firstboot.service + systemctl daemon-reload + fi } #check if we can apply the update From 20932fa232245f667ba8b818fcbaa0978ab07836 Mon Sep 17 00:00:00 2001 From: Stefal Date: Sun, 6 Oct 2024 14:51:14 +0200 Subject: [PATCH 4/7] Fix #421 --- web_app/server.py | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/web_app/server.py b/web_app/server.py index 4c822aa..bb39670 100755 --- a/web_app/server.py +++ b/web_app/server.py @@ -102,9 +102,10 @@ {"service_unit" : "str2str_rtcm_svr.service", "name" : "rtcm_svr"}, {'service_unit' : 'str2str_rtcm_serial.service', "name" : "rtcm_serial"}, {"service_unit" : "str2str_file.service", "name" : "file"}, - {'service_unit' : 'rtkbase_archive.timer', "name" : "archive_timer"}, + {'service_unit' : 'rtkbase_archive.timer', "name" : "archive_timer"}, {'service_unit' : 'rtkbase_archive.service', "name" : "archive_service"}, {'service_unit' : 'rtkbase_raw2nmea.service', "name" : "raw2nmea"}, + {'service_unit' : 'rtkbase_gnss_web_proxy.service', "name": "RTKBase Reverse Proxy for Gnss receiver Web Server"} ] #Delay before rtkrcv will stop if no user is on status.html page @@ -840,8 +841,8 @@ def getServicesStatus(emit_pingback=True): """ #print("Getting services status") - try: - for service in services_list: + for service in services_list: + try: #print("unit qui déconne : ", service["name"]) service["active"] = service["unit"].isActive() service["status"] = service["unit"].status() @@ -853,11 +854,11 @@ def getServicesStatus(emit_pingback=True): else: service["state_ok"] = None - except Exception as e: - #print("Error getting service info for: {} - {}".format(service['name'], e)) - #TODO manage better the error with rtkbase_archive.service. See https://github.com/Stefal/rtkbase/issues/162 - #and try to remove this "pass" without any notification (bad practive) - pass + except Exception as e: + print("Error getting service info for: {} - {}".format(service['name'], e)) + #TODO manage better the error with rtkbase_archive.service. See https://github.com/Stefal/rtkbase/issues/162 + #and try to remove this "pass" without any notification (bad practive) + pass services_status = [] for service in services_list: From c8adc04e823221cb05a2f8b83105f7a369190cf0 Mon Sep 17 00:00:00 2001 From: Stefal Date: Sun, 6 Oct 2024 14:56:49 +0200 Subject: [PATCH 5/7] update changelog.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2501839..b91d298 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,12 @@ # Changelog ## [2.6.2] - Unreleased +### Added + - Added Rtkbase gnss reverse proxy service in the diagnostic view. #421 ### Fixed - Remove firstboot service on Raspberry Pi image >= 2.5 which was causing services to stay stopped after a reboot. #436 - Autorefresh timeout is now 90s. #426 + ## [2.6.1] - 2024-08-26 ### Changed - More tests before installing prebuilt RTKLib cli tools. From a99900fcee3f5cbdf8d6b0c61fbe183edc7c322c Mon Sep 17 00:00:00 2001 From: Stefal Date: Sun, 6 Oct 2024 17:55:02 +0200 Subject: [PATCH 6/7] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b91d298..45d8de1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog -## [2.6.2] - Unreleased +## [2.6.2] - 2024-10-06 ### Added - Added Rtkbase gnss reverse proxy service in the diagnostic view. #421 ### Fixed From 5256c186dd7f661bdb4f1b3b780e8ea76cd3e75e Mon Sep 17 00:00:00 2001 From: Stefal Date: Sun, 6 Oct 2024 17:57:34 +0200 Subject: [PATCH 7/7] update changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 45d8de1..c75b328 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,7 @@ - Added Rtkbase gnss reverse proxy service in the diagnostic view. #421 ### Fixed - Remove firstboot service on Raspberry Pi image >= 2.5 which was causing services to stay stopped after a reboot. #436 - - Autorefresh timeout is now 90s. #426 + - Reboot autorefresh timeout is now 90s. #426 ## [2.6.1] - 2024-08-26 ### Changed