11.08., 9:00 - 11:00: Due to updates GitLab will be unavailable for some minutes between 09:00 and 11:00.

Commit b009ddc8 authored by Eckhart Arnold's avatar Eckhart Arnold

Merge remote-tracking branch 'origin/development' into development

parents 9e39b025 9b7cddf6
...@@ -151,6 +151,7 @@ def asyncio_run(coroutine: Coroutine, loop=None) -> Any: ...@@ -151,6 +151,7 @@ def asyncio_run(coroutine: Coroutine, loop=None) -> Any:
result = myloop.run_until_complete(coroutine) result = myloop.run_until_complete(coroutine)
if loop is None: if loop is None:
asyncio.set_event_loop(None) asyncio.set_event_loop(None)
myloop.run_until_complete(loop.shutdown_asyncgens())
myloop.close() myloop.close()
return result return result
...@@ -415,6 +416,7 @@ class Server: ...@@ -415,6 +416,7 @@ class Server:
finally: finally:
if loop is None: if loop is None:
asyncio.set_event_loop(None) asyncio.set_event_loop(None)
self.loop.run_until_complete(loop.shutdown_asyncgens())
self.loop.close() self.loop.close()
self.server.close() self.server.close()
asyncio_run(self.server.wait_closed()) asyncio_run(self.server.wait_closed())
......
...@@ -23,10 +23,8 @@ limitations under the License. ...@@ -23,10 +23,8 @@ limitations under the License.
import asyncio import asyncio
import json import json
import os import os
from multiprocessing import Process
import sys import sys
import time import time
from typing import Tuple
sys.path.extend(['../', './']) sys.path.extend(['../', './'])
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment