From f43cf23110a5745bfabbde5a953eaba1ac4031f1 Mon Sep 17 00:00:00 2001 From: "pixeebot[bot]" <104101892+pixeebot[bot]@users.noreply.github.com> Date: Tue, 5 Aug 2025 03:32:25 +0000 Subject: [PATCH] Add timeout to `requests` calls --- client/core/federer_handlers/config.py | 2 +- client/core/federer_handlers/sms.py | 2 +- client/core/interconnect.py | 4 ++-- cloud/ansible/files/monitors/etage_freeswitch_monitor.py | 2 +- cloud/certifier/scripts/gen_csr.py | 2 +- cloud/endagaweb/checkin.py | 4 ++-- cloud/endagaweb/ic_providers/kannel.py | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/core/federer_handlers/config.py b/client/core/federer_handlers/config.py index 47c6aa26..a56d3448 100644 --- a/client/core/federer_handlers/config.py +++ b/client/core/federer_handlers/config.py @@ -164,7 +164,7 @@ def log_worker(self, msgid, window_start, window_end, log_name): } files = {'file': open(tmp_file, 'rb')} r = requests.post(self.conf['registry'] + "/bts/logfile", data=params, - files=files, headers=self.ic.auth_header) + files=files, headers=self.ic.auth_header, timeout=60) try: if r.status_code == 200: logger.info("Log req %s posted successfully" % msgid) diff --git a/client/core/federer_handlers/sms.py b/client/core/federer_handlers/sms.py index c5131ecd..3a4e650f 100644 --- a/client/core/federer_handlers/sms.py +++ b/client/core/federer_handlers/sms.py @@ -117,6 +117,6 @@ def sms_worker(self, to, from_num, from_name, body, service_type): "destination": to, "service_type": service_type } - requests.post(billing_url, data=params) + requests.post(billing_url, data=params, timeout=60) except Exception as e: logger.error("Endaga " + traceback.format_exc(e)) diff --git a/client/core/interconnect.py b/client/core/interconnect.py index 33b1c022..a0869366 100644 --- a/client/core/interconnect.py +++ b/client/core/interconnect.py @@ -75,7 +75,7 @@ def register_subscriber(self, imsi): data={ 'imsi': imsi, 'bts_uuid': snowflake.snowflake() - }) + }, timeout=60) except BaseException as e: # log and rethrow logger.error("Endaga: Register network error: %s." % e) raise @@ -105,7 +105,7 @@ def send(self, to, from_, body, to_country=None, from_country=None): # TODO(matt): use urlparse.urljoin here? endpoint = self.conf['registry'] + "/send/" try: - r = requests.post(endpoint, headers=self.auth_header, data=message) + r = requests.post(endpoint, headers=self.auth_header, data=message, timeout=60) except BaseException as e: # log and rethrow as it was before logger.error("Endaga: Send SMS network error: %s." % e) raise diff --git a/cloud/ansible/files/monitors/etage_freeswitch_monitor.py b/cloud/ansible/files/monitors/etage_freeswitch_monitor.py index 1ef00ad9..571af0c1 100755 --- a/cloud/ansible/files/monitors/etage_freeswitch_monitor.py +++ b/cloud/ansible/files/monitors/etage_freeswitch_monitor.py @@ -68,4 +68,4 @@ def count_active_calls(dp): datapoints = [] check_sofia_status(datapoints) count_active_calls(datapoints) -requests.post(ODS_URL, data={'datapoints': json.dumps(datapoints)}) +requests.post(ODS_URL, data={'datapoints': json.dumps(datapoints)}, timeout=60) diff --git a/cloud/certifier/scripts/gen_csr.py b/cloud/certifier/scripts/gen_csr.py index be6cc0b7..a0d18240 100755 --- a/cloud/certifier/scripts/gen_csr.py +++ b/cloud/certifier/scripts/gen_csr.py @@ -32,7 +32,7 @@ params = { 'bts_uuid': iden } -r = requests.get("http://127.0.0.1:8080/api/v1/bts/sslconf", params=params) +r = requests.get("http://127.0.0.1:8080/api/v1/bts/sslconf", params=params, timeout=60) if (r.status_code != 200): raise Exception("Unable to generate ssl conf") diff --git a/cloud/endagaweb/checkin.py b/cloud/endagaweb/checkin.py index efa19311..5ba8e3b5 100644 --- a/cloud/endagaweb/checkin.py +++ b/cloud/endagaweb/checkin.py @@ -427,7 +427,7 @@ def sas_acquire(band, chnl, pwr_lvl): 'band': band, 'channel': chnl, 'power_level': pwr_lvl, - }) + }, timeout=60) except Exception: logging.error('SASON Acquire failed') return None @@ -440,7 +440,7 @@ def sas_request(): 'long': self.bts.longitude, # self for now -kurtis 'bands': self.bts.band, - }) + }, timeout=60) except Exception: logging.error('SASON Request failed') return None diff --git a/cloud/endagaweb/ic_providers/kannel.py b/cloud/endagaweb/ic_providers/kannel.py index af834aa8..eba06391 100644 --- a/cloud/endagaweb/ic_providers/kannel.py +++ b/cloud/endagaweb/ic_providers/kannel.py @@ -72,6 +72,6 @@ def send(self, to, from_, body, to_country=None, from_country=None): 'text' : body } - r = requests.get(self.outbound_sms_url, params=request) + r = requests.get(self.outbound_sms_url, params=request, timeout=60) return (r.status_code >= 200 and r.status_code < 300)