From ea29e4b96796b2c1acdedbcd1342ee18e966e3bf Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Wed, 26 Feb 2020 10:06:24 +0100 Subject: [PATCH] Alias: geoip, catch requests errors and log+return. fixes https://github.com/opnsense/core/commit/ce2b145185aed9a9306380a46f773d211623df45 --- src/opnsense/scripts/filter/lib/geoip.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/opnsense/scripts/filter/lib/geoip.py b/src/opnsense/scripts/filter/lib/geoip.py index c9f7eb48e..b5ddd83f5 100755 --- a/src/opnsense/scripts/filter/lib/geoip.py +++ b/src/opnsense/scripts/filter/lib/geoip.py @@ -35,6 +35,7 @@ import sys import ujson import requests import zipfile +import syslog from configparser import ConfigParser @@ -59,7 +60,11 @@ def download_geolite(): if url is not None: # flush data from remote url to temp file and unpack from there with tempfile.NamedTemporaryFile() as tmp_stream: - r = requests.get(url) + try: + r = requests.get(url) + except Exception as e: + syslog.syslog(syslog.LOG_ERR, 'geoip update failed : %s' % e) + return result if r.status_code == 200: tmp_stream.write(r.content) tmp_stream.seek(0)