From 5ff14be92f50b015e6dd5c5bf9f3aa8647d885fd Mon Sep 17 00:00:00 2001
From: amcmanu3 <mcdeweykp@gmail.com>
Date: Wed, 8 Mar 2023 18:46:06 -0500
Subject: [PATCH 1/4] Add a fallback for google.com

---
 app/classes/shared/helpers.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/classes/shared/helpers.py b/app/classes/shared/helpers.py
index cf108bcd..9efb8b0a 100644
--- a/app/classes/shared/helpers.py
+++ b/app/classes/shared/helpers.py
@@ -294,7 +294,12 @@ class Helpers:
             requests.get("https://ntp.org", timeout=1)
             return True
         except Exception:
-            return False
+            try:
+                logger.error("ntp.org ping failed. Falling back to google")
+                requests.get("https://google.com", timeout=1)
+                return True
+            except Exception:
+                return False
 
     @staticmethod
     def check_port(server_port):

From 6fa1b02888f655f6c3b53b60c76a0f3bfdad1704 Mon Sep 17 00:00:00 2001
From: Andrew <mcdeweykp@gmail.com>
Date: Thu, 9 Mar 2023 11:09:58 -0500
Subject: [PATCH 2/4] Add better logging on tz failures

---
 app/classes/shared/server.py | 3 ++-
 app/classes/shared/tasks.py  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/classes/shared/server.py b/app/classes/shared/server.py
index 9ca54a90..fa68eb62 100644
--- a/app/classes/shared/server.py
+++ b/app/classes/shared/server.py
@@ -134,9 +134,10 @@ class ServerInstance:
         self.last_backup_failed = False
         try:
             self.tz = get_localzone()
-        except ZoneInfoNotFoundError:
+        except ZoneInfoNotFoundError as e:
             logger.error(
                 "Could not capture time zone from system. Falling back to Europe/London"
+                f" error: {e}"
             )
             self.tz = ZoneInfo("Europe/London")
         self.server_scheduler = BackgroundScheduler(timezone=str(self.tz))
diff --git a/app/classes/shared/tasks.py b/app/classes/shared/tasks.py
index 8f51842b..dccaf4e3 100644
--- a/app/classes/shared/tasks.py
+++ b/app/classes/shared/tasks.py
@@ -47,9 +47,10 @@ class TasksManager:
         self.tornado: Webserver = Webserver(helper, controller, self)
         try:
             self.tz = get_localzone()
-        except ZoneInfoNotFoundError:
+        except ZoneInfoNotFoundError as e:
             logger.error(
                 "Could not capture time zone from system. Falling back to Europe/London"
+                f" error: {e}"
             )
             self.tz = "Europe/London"
         self.scheduler = BackgroundScheduler(timezone=str(self.tz))

From 611dd0feaf37b72d0d39f62dcfae458aff985b2f Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sat, 1 Apr 2023 14:15:09 +0100
Subject: [PATCH 3/4] Update changelog !569

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb028326..13a15f0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ TBD
 ### Bug fixes
 TBD
 ### Tweaks
-TBD
+- Improve logging on tz failures ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/569))
 ### Lang
 TBD
 <br><br>

From 64a4c25af5b508609dfe994eabf9bf0a487ef1f1 Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sat, 1 Apr 2023 14:34:57 +0100
Subject: [PATCH 4/4] Update changelog !570

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13a15f0d..e8feec95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,7 @@ TBD
 TBD
 ### Tweaks
 - Improve logging on tz failures ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/569))
+- Add fallback for ping domain to provide better feedback on internet connection ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/570))
 ### Lang
 TBD
 <br><br>