Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into 'devops/docker-hub-registry'

Browse Source 
# Conflicts:
#   CHANGELOG.md
This commit is contained in:
Iain Powrie 2023-01-07 15:24:28 +00:00
commit 4042e16cf1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -20,6 +20,7 @@ TBD
- Make server directories non-configurable ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/511)) - Make server directories non-configurable ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/511))
- Add popover to server port to detail it's purpose ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/514)) - Add popover to server port to detail it's purpose ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/514))
- Add server start timeout w/ WS Warning ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/518)) - Add server start timeout w/ WS Warning ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/518))
- Replace google ping for ntp for internet checks in locked-down countries ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/524))
- Add pushing to DockerHub registry ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/526)) - Add pushing to DockerHub registry ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/526))
### Lang ### Lang
TBD TBD

2
app/classes/shared/helpers.py
View File

@ -272,7 +272,7 @@ class Helpers:
@staticmethod @staticmethod
def check_internet(): def check_internet():
try: try:
requests.get("https://google.com", timeout=1) requests.get("https://ntp.org", timeout=1)
return True return True
except Exception: except Exception:
return False return False