summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleš Mrázek <ales.mrazek@nic.cz>2024-07-19 14:24:13 +0200
committerAleš Mrázek <ales.mrazek@nic.cz>2024-07-19 14:24:13 +0200
commit55875866c3d5e432388704e5d3282dfa00d079ad (patch)
tree88bbaa374d2869c42b4fcd3470765489b681a002
parentMerge !1566: treewide nit: avoid NULL arithmetics (diff)
parentmanager/utils/request.py: use self.timeout in UnixHTTPConnection (diff)
downloadknot-resolver-55875866c3d5e432388704e5d3282dfa00d079ad.tar.xz
knot-resolver-55875866c3d5e432388704e5d3282dfa00d079ad.zip
Merge branch 'manager-ci-pkg-fix' into 'master'
manager: utils: timeout fix for unix-socket http request See merge request knot/knot-resolver!1568
-rw-r--r--manager/knot_resolver_manager/utils/requests.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/manager/knot_resolver_manager/utils/requests.py b/manager/knot_resolver_manager/utils/requests.py
index 72a4d1fa..e52e54a3 100644
--- a/manager/knot_resolver_manager/utils/requests.py
+++ b/manager/knot_resolver_manager/utils/requests.py
@@ -115,7 +115,7 @@ class UnixHTTPConnection(HTTPConnection):
def connect(self):
sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
- sock.settimeout(1) # there is something weird stored in self.timeout
+ sock.settimeout(self.timeout)
sock.connect(self.unix_socket_path)
self.sock = sock