From 8f75b3b209175471b0d0ec11577efdfbbce4dae8 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Fri, 10 Jan 2025 10:02:45 +0100 Subject: [PATCH] Continued: - moved timeout values for nodeinfo-fetch to local "cached" variable --- fba/http/nodeinfo.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/fba/http/nodeinfo.py b/fba/http/nodeinfo.py index 9e81bb9..238f679 100644 --- a/fba/http/nodeinfo.py +++ b/fba/http/nodeinfo.py @@ -57,7 +57,14 @@ _nodeinfo_identifier = [ ] # Locally "cached" values to speedup code and keep massive debug log shorter -_timeout = (config.get("connection_timeout"), config.get("read_timeout")) +_timeout = ( + config.get("connection_timeout"), + config.get("read_timeout") +) +_nodeinfo_timeout = ( + config.get("nodeinfo_connection_timeout"), + config.get("nodeinfo_read_timeout") +) logging.basicConfig(level=logging.INFO) logger = logging.getLogger(__name__) @@ -121,7 +128,7 @@ def fetch(domain: str, path: str = None, update_mode: bool = True) -> dict: domain, request, headers=headers, - timeout=(config.get("nodeinfo_connection_timeout"), config.get("nodeinfo_read_timeout")) + timeout=_nodeinfo_timeout ) logger.debug("data(%d)[]='%s'", len(data), type(data)) @@ -175,8 +182,8 @@ def fetch_wellknown_nodeinfo(domain: str) -> dict: data = network.get_json_api( domain, path, - headers, - (config.get("nodeinfo_connection_timeout"), config.get("nodeinfo_read_timeout")) + headers=headers, + timeout=_nodeinfo_timeout ) logger.debug("data(%d)[]='%s'", len(data), type(data)) -- 2.39.5