sysadmin/openfreemap
1
0
Fork 0
mirror of https://github.com/hyperknot/openfreemap.git synced 2026-05-21 14:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

relaxed mode tweaks

Browse Source
This commit is contained in:
Zsolt Ero
2024-09-12 17:07:06 +02:00
parent 4945fbb7b3
commit b083c41d21
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -20,3 +20,4 @@ venv
/pnpm-lock.yaml /pnpm-lock.yaml
/deploy-all.sh /deploy-all.sh
/deploy-cron.sh

7
modules/loadbalancer/loadbalancer_lib/loadbalance.py
View File

@@ -60,7 +60,11 @@ def run_area(area):
# using relaxed mode for while the servers are still deploying # using relaxed mode for while the servers are still deploying
now = datetime.now(timezone.utc) now = datetime.now(timezone.utc)
relaxed_mode = last_modified > now - timedelta(minutes=2) delta = now - last_modified
relaxed_mode = delta < timedelta(minutes=2)
if relaxed_mode:
print(' using relaxed mode')
results = {} results = {}
@@ -68,7 +72,6 @@ def run_area(area):
try: try:
# don't check latest # don't check latest
if relaxed_mode: if relaxed_mode:
print('using relaxed mode')
check_host_version(config.domain_ledns, host_ip, area, version) check_host_version(config.domain_ledns, host_ip, area, version)
else: else:
check_host_latest(config.domain_ledns, host_ip, area, version) check_host_latest(config.domain_ledns, host_ip, area, version)

8
modules/tile_gen/tile_gen_lib/set_version.py
View File

@@ -1,7 +1,7 @@
import subprocess import subprocess
from tile_gen_lib.config import config from tile_gen_lib.config import config
from tile_gen_lib.shared import check_host_version, get_versions_for_area from tile_gen_lib.shared import check_host_version, get_deployed_version, get_versions_for_area
def check_and_set_version(area, version): def check_and_set_version(area, version):
@@ -17,6 +17,12 @@ def check_and_set_version(area, version):
if not check_all_hosts(area, version): if not check_all_hosts(area, version):
return return
try:
if get_deployed_version(area)['version'] == version:
return
except Exception:
pass
set_version(area, version) set_version(area, version)