monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MultiServer: exit console task when console thread dies (#2068)

This commit is contained in:
black-sliver 2023-08-04 10:01:51 +02:00 committed by GitHub
parent 6864f28f3e
commit eb50e0781e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MultiServer.py
View File

@ -2118,13 +2118,15 @@ class ServerCommandProcessor(CommonCommandProcessor):
async def console(ctx: Context): async def console(ctx: Context):
import sys import sys
queue = asyncio.Queue() queue = asyncio.Queue()
Utils.stream_input(sys.stdin, queue) worker = Utils.stream_input(sys.stdin, queue)
while not ctx.exit_event.is_set(): while not ctx.exit_event.is_set():
try: try:
# I don't get why this while loop is needed. Works fine without it on clients, # I don't get why this while loop is needed. Works fine without it on clients,
# but the queue.get() for server never fulfills if the queue is empty when entering the await. # but the queue.get() for server never fulfills if the queue is empty when entering the await.
while queue.qsize() == 0: while queue.qsize() == 0:
await asyncio.sleep(0.05) await asyncio.sleep(0.05)
if not worker.is_alive():
return
input_text = await queue.get() input_text = await queue.get()
queue.task_done() queue.task_done()
ctx.commandprocessor(input_text) ctx.commandprocessor(input_text)