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

loadbalancer works

Browse Source
This commit is contained in:
Zsolt Ero
2024-09-12 15:34:53 +02:00
parent a346ef347e
commit c8aa63edc6
7 changed files with 156 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
modules/tile_gen/tile_gen_lib/shared.py
View File

@@ -27,14 +27,16 @@ def get_versions_for_area(area: str) -> list:
return sorted(versions)
def get_deployed_version(area: str) -> str:
r = requests.get(f'https://assets.openfreemap.com/deployed_versions/{area}.txt', timeout=30)
r.raise_for_status()
remote_version = r.text.strip()
return remote_version
def check_host_version(domain, host_ip, area, version):
# check versioned TileJSON
url = f'https://{domain}/{area}/{version}'
tilejson_str = pycurl_get(url, domain, host_ip)
tilejson = json.loads(tilejson_str)
tiles_url = tilejson['tiles'][0]
version_in_tilejson = tiles_url.split('/')[4]
assert version_in_tilejson == version
check_tilejson(f'https://{domain}/{area}/{version}', domain, host_ip, version)
# check actual vector tile
url = f'https://{domain}/{area}/{version}/14/8529/5975.pbf'
@@ -42,13 +44,11 @@ def check_host_version(domain, host_ip, area, version):
def check_host_latest(domain, host_ip, area, version):
# check TileJSON first
url = f'https://{domain}/{area}'
tilejson_str = pycurl_get(url, domain, host_ip)
tilejson = json.loads(tilejson_str)
tiles_url = tilejson['tiles'][0]
version_in_tilejson = tiles_url.split('/')[4]
assert version_in_tilejson == version
# check latest TileJSON
check_tilejson(f'https://{domain}/{area}', domain, host_ip, version)
# check versioned TileJSON
check_tilejson(f'https://{domain}/{area}/{version}', domain, host_ip, version)
# check actual vector tile
url = f'https://{domain}/{area}/{version}/14/8529/5975.pbf'
@@ -59,6 +59,14 @@ def check_host_latest(domain, host_ip, area, version):
assert pycurl_status(url, domain, host_ip) == 200
def check_tilejson(url, domain, host_ip, version):
tilejson_str = pycurl_get(url, domain, host_ip)
tilejson = json.loads(tilejson_str)
tiles_url = tilejson['tiles'][0]
version_in_tilejson = tiles_url.split('/')[4]
assert version_in_tilejson == version
# pycurl