Rooba
/
tornado
mirror of https://github.com/tornadoweb/tornado.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1985 from bdarnell/websocket-convert-yielded 

websocket: Avoid calling convert_yielded twice on the same object
This commit is contained in:
Ben Darnell 2017-03-26 12:20:14 -04:00 committed by GitHub
parent 5d1a07581b 5a451d63fc
commit df31744f76
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tornado/websocket.py
View File

@ -467,9 +467,8 @@ class WebSocketProtocol(object):
self._abort() self._abort()
else: else:
if result is not None: if result is not None:
self.stream.io_loop.add_future(gen.convert_yielded(result), result = gen.convert_yielded(result)
lambda f: f.result()) self.stream.io_loop.add_future(result, lambda f: f.result())
return result return result
def on_connection_close(self): def on_connection_close(self):
@ -881,7 +880,7 @@ class WebSocketProtocol13(WebSocketProtocol):
if not self.client_terminated: if not self.client_terminated:
if handled_future: if handled_future:
# on_message is a coroutine, process more frames once it's done. # on_message is a coroutine, process more frames once it's done.
gen.convert_yielded(handled_future).add_done_callback( handled_future.add_done_callback(
lambda future: self._receive_frame()) lambda future: self._receive_frame())
else: else:
self._receive_frame() self._receive_frame()