open.source/magic-wormhole
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use timeouts for allocate and list_channels too

Browse Source
This commit is contained in:
Brian Warner 2015-11-11 18:00:06 -08:00
parent fa3be3523d
commit 6de677c1df
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/wormhole/blocking/transcribe.py
View File

@ -67,7 +67,8 @@ class Channel:
"phase": phase, "phase": phase,
"body": hexlify(msg).decode("ascii")} "body": hexlify(msg).decode("ascii")}
data = json.dumps(payload).encode("utf-8") data = json.dumps(payload).encode("utf-8")
r = requests.post(self._relay_url+"add", data=data) r = requests.post(self._relay_url+"add", data=data,
timeout=self._timeout)
r.raise_for_status() r.raise_for_status()
resp = r.json() resp = r.json()
self._add_inbound_messages(resp["messages"]) self._add_inbound_messages(resp["messages"])
@ -111,8 +112,13 @@ class Channel:
"channelid": self._channelid, "channelid": self._channelid,
"side": self._side, "side": self._side,
"mood": mood}).encode("utf-8") "mood": mood}).encode("utf-8")
requests.post(self._relay_url+"deallocate", data=data) try:
# ignore POST failure, don't call r.raise_for_status() # ignore POST failure, don't call r.raise_for_status(), set a
# short timeout and ignore failures
requests.post(self._relay_url+"deallocate", data=data,
timeout=5)
except requests.exceptions.Timeout:
pass
class ChannelManager: class ChannelManager:
def __init__(self, relay_url, appid, side, handle_welcome, def __init__(self, relay_url, appid, side, handle_welcome,
@ -126,7 +132,8 @@ class ChannelManager:
def list_channels(self): def list_channels(self):
queryargs = urlencode([("appid", self._appid)]) queryargs = urlencode([("appid", self._appid)])
r = requests.get(self._relay_url+"list?%s" % queryargs) r = requests.get(self._relay_url+"list?%s" % queryargs,
timeout=self._timeout)
r.raise_for_status() r.raise_for_status()
channelids = r.json()["channelids"] channelids = r.json()["channelids"]
return channelids return channelids
@ -134,7 +141,8 @@ class ChannelManager:
def allocate(self): def allocate(self):
data = json.dumps({"appid": self._appid, data = json.dumps({"appid": self._appid,
"side": self._side}).encode("utf-8") "side": self._side}).encode("utf-8")
r = requests.post(self._relay_url+"allocate", data=data) r = requests.post(self._relay_url+"allocate", data=data,
timeout=self._timeout)
r.raise_for_status() r.raise_for_status()
data = r.json() data = r.json()
if "welcome" in data: if "welcome" in data: