diff --git a/.gitignore b/.gitignore index 313e965..4ede417 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ venv /pnpm-lock.yaml /deploy-all.sh +/deploy-cron.sh diff --git a/modules/loadbalancer/loadbalancer_lib/loadbalance.py b/modules/loadbalancer/loadbalancer_lib/loadbalance.py index 48e4081..0afc627 100644 --- a/modules/loadbalancer/loadbalancer_lib/loadbalance.py +++ b/modules/loadbalancer/loadbalancer_lib/loadbalance.py @@ -60,7 +60,11 @@ def run_area(area): # using relaxed mode for while the servers are still deploying 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 = {} @@ -68,7 +72,6 @@ def run_area(area): try: # don't check latest if relaxed_mode: - print('using relaxed mode') check_host_version(config.domain_ledns, host_ip, area, version) else: check_host_latest(config.domain_ledns, host_ip, area, version) diff --git a/modules/tile_gen/tile_gen_lib/set_version.py b/modules/tile_gen/tile_gen_lib/set_version.py index 01a0241..8fa92f5 100644 --- a/modules/tile_gen/tile_gen_lib/set_version.py +++ b/modules/tile_gen/tile_gen_lib/set_version.py @@ -1,7 +1,7 @@ import subprocess 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): @@ -17,6 +17,12 @@ def check_and_set_version(area, version): if not check_all_hosts(area, version): return + try: + if get_deployed_version(area)['version'] == version: + return + except Exception: + pass + set_version(area, version)