diff --git a/install.sh b/install.sh index 095d308..44d9e7c 100644 --- a/install.sh +++ b/install.sh @@ -350,6 +350,7 @@ confirmdlg() { packages=() aptGetWasUpdated=0 freshInstall=0 +cachedMenuDomain='' MIKRUS_APIKEY='' MIKRUS_HOST='' @@ -1087,10 +1088,18 @@ get_watchdog_status_code_live() { local COMBINED_STATUS="$NS_STATUS $DB_STATUS" if [ "$COMBINED_STATUS" = "running running" ]; then - local domain=$(get_td_domain) + + status="detection_failed" + + local domain=$cachedMenuDomain + local cachedDomainLen=${#cachedMenuDomain} + if ((cachedDomainLen < 16)); then + domain=$(get_td_domain) + fi + local domainLen=${#domain} if ((domainLen > 15)); then - + cachedMenuDomain=$domain local html=$(curl -Lks "$domain") if [[ "$html" =~ github.com/nightscout/cgm-remote-monitor ]]; then @@ -1107,7 +1116,7 @@ get_watchdog_status_code_live() { fi else - status="detection_failed" + status="domain_failed" fi else @@ -1142,6 +1151,9 @@ get_watchdog_status() { "detection_failed") printf "\U2753 nieznany stan" ;; + "domain_failed") + printf "\U2753 problem z domenÄ…" + ;; "crashed") printf "\U1F4A5 awaria NS" ;; @@ -1606,7 +1618,7 @@ watchdog_check() { fi else - WATCHDOG_STATUS="detection_failed" + WATCHDOG_STATUS="domain_failed" fi else diff --git a/src/lib.sh b/src/lib.sh index 3170e7e..c919996 100644 --- a/src/lib.sh +++ b/src/lib.sh @@ -334,6 +334,7 @@ confirmdlg() { packages=() aptGetWasUpdated=0 freshInstall=0 +cachedMenuDomain='' MIKRUS_APIKEY='' MIKRUS_HOST='' @@ -1071,10 +1072,18 @@ get_watchdog_status_code_live() { local COMBINED_STATUS="$NS_STATUS $DB_STATUS" if [ "$COMBINED_STATUS" = "running running" ]; then - local domain=$(get_td_domain) + + status="detection_failed" + + local domain=$cachedMenuDomain + local cachedDomainLen=${#cachedMenuDomain} + if ((cachedDomainLen < 16)); then + domain=$(get_td_domain) + fi + local domainLen=${#domain} if ((domainLen > 15)); then - + cachedMenuDomain=$domain local html=$(curl -Lks "$domain") if [[ "$html" =~ github.com/nightscout/cgm-remote-monitor ]]; then @@ -1091,7 +1100,7 @@ get_watchdog_status_code_live() { fi else - status="detection_failed" + status="domain_failed" fi else @@ -1126,6 +1135,9 @@ get_watchdog_status() { "detection_failed") printf "\U2753 nieznany stan" ;; + "domain_failed") + printf "\U2753 problem z domenÄ…" + ;; "crashed") printf "\U1F4A5 awaria NS" ;; @@ -1590,7 +1602,7 @@ watchdog_check() { fi else - WATCHDOG_STATUS="detection_failed" + WATCHDOG_STATUS="domain_failed" fi else diff --git a/updated b/updated index 4a4c9f4..7dda6c1 100644 --- a/updated +++ b/updated @@ -1 +1 @@ -2024-01-07T14:13:41.909Z \ No newline at end of file +2024-01-07T14:41:12.444Z \ No newline at end of file