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

server API: include "mood" when closing the channel

Browse Source 
This will be used as a simple unverifiable counter of success/failure.
This commit is contained in:
Brian Warner 2015-10-08 18:35:26 -07:00
parent 7a3b18b7f7
commit 595a0e5845
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,11 +104,12 @@ class Channel:
time.sleep(self._wait) time.sleep(self._wait)
return body return body
def deallocate(self): def deallocate(self, mood=u"unknown"):
# only try once, no retries # only try once, no retries
data = json.dumps({"appid": self._appid, data = json.dumps({"appid": self._appid,
"channelid": self._channelid, "channelid": self._channelid,
"side": self._side}).encode("utf-8") "side": self._side,
"mood": mood}).encode("utf-8")
requests.post(self._relay_url+"deallocate", data=data) requests.post(self._relay_url+"deallocate", data=data)
# ignore POST failure, don't call r.raise_for_status() # ignore POST failure, don't call r.raise_for_status()

5
src/wormhole/test/test_blocking.py
View File

@ -28,7 +28,8 @@ class Channel(ServerBase, unittest.TestCase):
def _connected(c): def _connected(c):
self._channel = c self._channel = c
d.addCallback(_connected) d.addCallback(_connected)
d.addCallback(lambda _: deferToThread(self._channel.deallocate)) d.addCallback(lambda _: deferToThread(self._channel.deallocate,
u"happy"))
return d return d
def test_messages(self): def test_messages(self):
@ -54,7 +55,7 @@ class Channel(ServerBase, unittest.TestCase):
self.failUnlessEqual(len(self._relay_server._apps), 1) self.failUnlessEqual(len(self._relay_server._apps), 1)
d.addCallback(_not_yet) d.addCallback(_not_yet)
# but deallocating both will make the messages go away # but deallocating both will make the messages go away
d.addCallback(lambda _: deferToThread(c1.deallocate)) d.addCallback(lambda _: deferToThread(c1.deallocate, u"sad"))
def _gone(_): def _gone(_):
self._relay_server.prune() self._relay_server.prune()
self.failUnlessEqual(len(self._relay_server._apps), 0) self.failUnlessEqual(len(self._relay_server._apps), 0)

4
src/wormhole/test/test_twisted.py
View File

@ -27,7 +27,7 @@ class Channel(ServerBase, unittest.TestCase):
def _connected(c): def _connected(c):
self._channel = c self._channel = c
d.addCallback(_connected) d.addCallback(_connected)
d.addCallback(lambda _: self._channel.deallocate()) d.addCallback(lambda _: self._channel.deallocate(u"happy"))
return d return d
def test_messages(self): def test_messages(self):
@ -53,7 +53,7 @@ class Channel(ServerBase, unittest.TestCase):
self.failUnlessEqual(len(self._relay_server._apps), 1) self.failUnlessEqual(len(self._relay_server._apps), 1)
d.addCallback(_not_yet) d.addCallback(_not_yet)
# but deallocating both will make the messages go away # but deallocating both will make the messages go away
d.addCallback(lambda _: c1.deallocate()) d.addCallback(lambda _: c1.deallocate(u"sad"))
def _gone(_): def _gone(_):
self._relay_server.prune() self._relay_server.prune()
self.failUnlessEqual(len(self._relay_server._apps), 0) self.failUnlessEqual(len(self._relay_server._apps), 0)

5
src/wormhole/twisted/transcribe.py
View File

@ -133,12 +133,13 @@ class Channel:
d.addCallback(lambda _: msgs[0]) d.addCallback(lambda _: msgs[0])
return d return d
def deallocate(self): def deallocate(self, mood=u"unknown"):
# only try once, no retries # only try once, no retries
d = post_json(self._agent, self._relay_url+"deallocate", d = post_json(self._agent, self._relay_url+"deallocate",
{"appid": self._appid, {"appid": self._appid,
"channelid": self._channelid, "channelid": self._channelid,
"side": self._side}) "side": self._side,
"mood": mood})
d.addBoth(lambda _: None) # ignore POST failure d.addBoth(lambda _: None) # ignore POST failure
return d return d