This is an archive of the discontinued Mercurial Phabricator instance.

Differential D742

fbconduit: add timeout
ClosedPublic

Authored by stash on Sep 20 2017, 5:46 AM.
Tags
None
Subscribers
None

Details

Reviewers
shivramk
mitrandir
Group Reviewers
Restricted Project
Commits
rFBHGXfb27e24bd713: fbconduit: add timeout
Summary

Just as in phabricator/conduit.py. It is necessary for D620

BTW, not sure why do we have very similar code in two places.

Test Plan

Will be tested in D620

Diff Detail

Repository
rFBHGX Facebook Mercurial Extensions
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

stash created this revision.Sep 20 2017, 5:46 AM
mitrandir accepted this revision.Sep 21 2017, 8:20 AM
This revision is now accepted and ready to land.Sep 21 2017, 8:20 AM
Closed by commit rFBHGXfb27e24bd713: fbconduit: add timeout (authored by stash). · Explain WhySep 21 2017, 5:53 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext3rd/fbconduit.py (7 lines)

Diff 1983

hgext3rd/fbconduit.py

from urllib import urlencode from urllib import urlencode
from mercurial.util import httplib from mercurial.util import httplib
conduit_host = None conduit_host = None
conduit_path = None conduit_path = None
conduit_protocol = None conduit_protocol = None
connection = None connection = None
DEFAULT_TIMEOUT = 60
MAX_CONNECT_RETRIES = 3 MAX_CONNECT_RETRIES = 3
class ConduitError(Exception): class ConduitError(Exception):
pass pass
class HttpError(Exception): class HttpError(Exception):
pass pass
if conduit_host is None: if conduit_host is None:
return False return False
if conduit_protocol is None: if conduit_protocol is None:
conduit_protocol = 'https' conduit_protocol = 'https'
return True return True
def call_conduit(method, **kwargs): def call_conduit(method, timeout=DEFAULT_TIMEOUT, **kwargs):
global connection, conduit_host, conduit_path, conduit_protocol global connection, conduit_host, conduit_path, conduit_protocol
# start connection # start connection
# TODO: move to python-requests # TODO: move to python-requests
if connection is None: if connection is None:
if conduit_protocol == 'https': if conduit_protocol == 'https':
connection = httplib.HTTPSConnection(conduit_host) connection = httplib.HTTPSConnection(conduit_host, timeout=timeout)
elif conduit_protocol == 'http': elif conduit_protocol == 'http':
connection = httplib.HTTPConnection(conduit_host) connection = httplib.HTTPConnection(conduit_host, timeout=timeout)
# send request # send request
path = conduit_path + method path = conduit_path + method
args = urlencode({'params': json.dumps(kwargs)}) args = urlencode({'params': json.dumps(kwargs)})
headers = { headers = {
'Connection': 'Keep-Alive', 'Connection': 'Keep-Alive',
'Content-Type': 'application/x-www-form-urlencoded', 'Content-Type': 'application/x-www-form-urlencoded',
} }