StealthOS/subiquity
StealthOS
/
subiquity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1804 from dbungert/lp-2034715-just-wait-longer 

snapd api: wait longer
This commit is contained in:
Dan Bungert 2023-09-22 16:09:15 -06:00 committed by GitHub
parent d7f5ef1a99 5a573f2cef
commit 333e4d96c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
subiquitycore/snapd.py
View File

@ -33,6 +33,11 @@ log = logging.getLogger("subiquitycore.snapd")
class SnapdConnection:
# In LP: #2034715, we found that while some requests should be
# non-blocking, they are actually blocking and exceeding one minute.
# Extending the timeout helps.
default_timeout_seconds = 600
def __init__(self, root, sock):
self.root = root
self.url_base = "http+unix://{}/".format(quote_plus(sock))
@ -41,13 +46,19 @@ class SnapdConnection:
if args:
path += "?" + urlencode(args)
with requests_unixsocket.Session() as session:
return session.get(self.url_base + path, timeout=60)
return session.get(
self.url_base + path, timeout=self.default_timeout_seconds
)
def post(self, path, body, **args):
if args:
path += "?" + urlencode(args)
with requests_unixsocket.Session() as session:
return session.post(self.url_base + path, data=json.dumps(body), timeout=60)
return session.post(
self.url_base + path,
data=json.dumps(body),
timeout=self.default_timeout_seconds,
)
def configure_proxy(self, proxy):
log.debug("restarting snapd to pick up proxy config")