This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9453

phabricator: use the `http.timeout` config for conduit call
ClosedPublic

Authored by marmoute on Nov 29 2020, 5:10 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG4d70444c3ea9: phabricator: use the `http.timeout` config for conduit call
Summary

Adding some timeout definitely help looping faster through the "bad connection"
that I suffer from. So lets make it available.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

marmoute created this revision.Nov 29 2020, 5:10 AM
pulkit accepted this revision.Nov 29 2020, 8:53 AM
This revision is now accepted and ready to land.Nov 29 2020, 8:53 AM

Revision Contents
Changeset List

PathPackages
Mhgext/phabricator.py (11 lines)

Diff 23805

hgext/phabricator.py

# retry failed command N time (default 0). Useful when using the extension # retry failed command N time (default 0). Useful when using the extension
# over flakly connection. # over flakly connection.
# #
# We wait `retry.interval` between each retry, in seconds. # We wait `retry.interval` between each retry, in seconds.
# (default 1 second). # (default 1 second).
retry = 3 retry = 3
retry.interval = 10 retry.interval = 10
# the retry option can combine well with the http.timeout one.
#
# For example to give up on http request after 20 seconds:
[http]
timeout=20
[auth] [auth]
example.schemes = https example.schemes = https
example.prefix = phab.example.com example.prefix = phab.example.com
# API token. Get it from https://$HOST/conduit/login/ # API token. Get it from https://$HOST/conduit/login/
example.phabtoken = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxx example.phabtoken = cli-xxxxxxxxxxxxxxxxxxxxxxxxxxxx
""" """
) )
sin.write(data) sin.write(data)
sin.close() sin.close()
body = sout.read() body = sout.read()
else: else:
urlopener = urlmod.opener(ui, authinfo) urlopener = urlmod.opener(ui, authinfo)
request = util.urlreq.request(pycompat.strurl(url), data=data) request = util.urlreq.request(pycompat.strurl(url), data=data)
max_try = ui.configint(b'phabricator', b'retry') + 1 max_try = ui.configint(b'phabricator', b'retry') + 1
timeout = ui.configwith(float, b'http', b'timeout')
for try_count in range(max_try): for try_count in range(max_try):
try: try:
with contextlib.closing(urlopener.open(request)) as rsp: with contextlib.closing(
urlopener.open(request, timeout=timeout)
) as rsp:
body = rsp.read() body = rsp.read()
break break
except util.urlerr.urlerror as err: except util.urlerr.urlerror as err:
if try_count == max_try - 1: if try_count == max_try - 1:
raise raise
ui.debug( ui.debug(
b'Conduit Request failed (try %d/%d): %r\n' b'Conduit Request failed (try %d/%d): %r\n'
% (try_count + 1, max_try, err) % (try_count + 1, max_try, err)