From dc74c869a1d4024dde6d358a3e78b162ba58cb24 Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Mon, 14 Nov 2016 19:24:17 +0900 Subject: [PATCH] Await task after cancelling it. --- server/protocol.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/protocol.py b/server/protocol.py index eeeb789..d433621 100644 --- a/server/protocol.py +++ b/server/protocol.py @@ -139,11 +139,11 @@ class ServerManager(LoggedClass): while True: task = await self.tasks.get() try: - if task.session in self.sessions: - self.current_task = task - await task.job - else: + if not task.session in self.sessions: + self.logger.info('cancelling task of gone session') task.job.cancel() + self.current_task = task + await task.job except asyncio.CancelledError: self.logger.info('cancelled task noted') except Exception: