Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add fallback to local mmdb file if the download.db-ip.com domain isn't reachable

Browse source
This commit is contained in:
Théophile Diot 2024-10-02 06:43:30 +02:00
parent bf873339e7
commit 49c12e71b2
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
2 changed files with 34 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/common/core/jobs/jobs/mmdb-asn.py
View file

@ -82,27 +82,25 @@ try:
for chunk in resp.iter_content(chunk_size=4 * 1024):
if chunk:
file_content.write(chunk)
except RequestException as e:
LOGGER.error(f"Error while downloading mmdb file from {mmdb_url}: {e}")
sys_exit(2)
try:
assert file_content
except AssertionError:
LOGGER.error(f"Error while downloading mmdb file from {mmdb_url}")
sys_exit(2)
# Decompress it
LOGGER.info("Decompressing mmdb file ...")
file_content.seek(0)
tmp_path.write_bytes(decompress(file_content.getvalue()))
# Decompress it
LOGGER.info("Decompressing mmdb file ...")
file_content.seek(0)
tmp_path.write_bytes(decompress(file_content.getvalue()))
if job_cache:
# Check if file has changed
new_hash = file_hash(tmp_path)
if new_hash == job_cache["checksum"]:
LOGGER.info("New file is identical to cache file, reload is not needed")
sys_exit(0)
if job_cache:
# Check if file has changed
new_hash = file_hash(tmp_path)
if new_hash == job_cache["checksum"]:
LOGGER.info("New file is identical to cache file, reload is not needed")
sys_exit(0)
except BaseException as e:
LOGGER.error(f"Error while downloading mmdb file from {mmdb_url}: {e}")
if not tmp_path.is_file():
sys_exit(2)
LOGGER.warning("Falling back to project cached mmdb file.")
# Try to load it
LOGGER.info("Checking if mmdb file is valid ...")

36
src/common/core/jobs/jobs/mmdb-country.py
View file

@ -82,27 +82,25 @@ try:
for chunk in resp.iter_content(chunk_size=4 * 1024):
if chunk:
file_content.write(chunk)
except RequestException as e:
LOGGER.error(f"Error while downloading mmdb file from {mmdb_url}: {e}")
sys_exit(2)
try:
assert file_content
except AssertionError:
LOGGER.error(f"Error while downloading mmdb file from {mmdb_url}")
sys_exit(2)
# Decompress it
LOGGER.info("Decompressing mmdb file ...")
file_content.seek(0)
tmp_path.write_bytes(decompress(file_content.getvalue()))
# Decompress it
LOGGER.info("Decompressing mmdb file ...")
file_content.seek(0)
tmp_path.write_bytes(decompress(file_content.getvalue()))
if job_cache:
# Check if file has changed
new_hash = file_hash(tmp_path)
if new_hash == job_cache["checksum"]:
LOGGER.info("New file is identical to cache file, reload is not needed")
sys_exit(0)
if job_cache:
# Check if file has changed
new_hash = file_hash(tmp_path)
if new_hash == job_cache["checksum"]:
LOGGER.info("New file is identical to cache file, reload is not needed")
sys_exit(0)
except BaseException as e:
LOGGER.error(f"Error while downloading mmdb file from {mmdb_url}: {e}")
if not tmp_path.is_file():
sys_exit(2)
LOGGER.warning("Falling back to project cached mmdb file.")
# Try to load it
LOGGER.info("Checking if mmdb file is valid ...")