M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

protocols/asyncio_server: minor cleanup

This commit is contained in:
Sebastien Bourdeauducq 2016-01-27 19:19:47 +01:00
parent dce2aac475
commit 79c0488ff1
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artiq/protocols/asyncio_server.py
View File

@ -7,7 +7,6 @@ class AsyncioServer:
Users of this class must derive from it and define the Users of this class must derive from it and define the
``_handle_connection_cr`` method and coroutine. ``_handle_connection_cr`` method and coroutine.
""" """
def __init__(self): def __init__(self):
self._client_tasks = set() self._client_tasks = set()
@ -23,15 +22,12 @@ class AsyncioServer:
:param host: Bind address of the server (see ``asyncio.start_server`` :param host: Bind address of the server (see ``asyncio.start_server``
from the Python standard library). from the Python standard library).
:param port: TCP port to bind to. :param port: TCP port to bind to.
""" """
self.server = await asyncio.start_server(self._handle_connection, self.server = await asyncio.start_server(self._handle_connection,
host, port) host, port)
async def stop(self): async def stop(self):
"""Stops the server. """Stops the server."""
"""
wait_for = copy(self._client_tasks) wait_for = copy(self._client_tasks)
for task in self._client_tasks: for task in self._client_tasks:
task.cancel() task.cancel()
@ -48,6 +44,6 @@ class AsyncioServer:
self._client_tasks.remove(task) self._client_tasks.remove(task)
def _handle_connection(self, reader, writer): def _handle_connection(self, reader, writer):
task = asyncio.Task(self._handle_connection_cr(reader, writer)) task = asyncio.ensure_future(self._handle_connection_cr(reader, writer))
self._client_tasks.add(task) self._client_tasks.add(task)
task.add_done_callback(self._client_done) task.add_done_callback(self._client_done)