mirror/Archipelago
1
0
Fork 1
mirror of https://github.com/ArchipelagoMW/Archipelago.git synced 2026-04-23 15:03:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

MultiServer: graceful shutdown for ctrl+c and sigterm (#5996)

Browse Source
This commit is contained in:
black-sliver
2026-03-03 23:02:12 +00:00
committed by GitHub
parent a3e8f69909
commit f26313367e
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
MultiServer.py
View File

@@ -21,6 +21,7 @@ import time
import typing import typing
import weakref import weakref
import zlib import zlib
from signal import SIGINT, SIGTERM
import ModuleUpdate import ModuleUpdate
@@ -2571,6 +2572,8 @@ async def console(ctx: Context):
input_text = await queue.get() input_text = await queue.get()
queue.task_done() queue.task_done()
ctx.commandprocessor(input_text) ctx.commandprocessor(input_text)
except asyncio.exceptions.CancelledError:
ctx.logger.info("ConsoleTask cancelled")
except: except:
import traceback import traceback
traceback.print_exc() traceback.print_exc()
@@ -2737,6 +2740,15 @@ async def main(args: argparse.Namespace):
console_task = asyncio.create_task(console(ctx)) console_task = asyncio.create_task(console(ctx))
if ctx.auto_shutdown: if ctx.auto_shutdown:
ctx.shutdown_task = asyncio.create_task(auto_shutdown(ctx, [console_task])) ctx.shutdown_task = asyncio.create_task(auto_shutdown(ctx, [console_task]))
def stop():
for remove_signal in [SIGINT, SIGTERM]:
asyncio.get_event_loop().remove_signal_handler(remove_signal)
ctx.commandprocessor._cmd_exit()
for signal in [SIGINT, SIGTERM]:
asyncio.get_event_loop().add_signal_handler(signal, stop)
await ctx.exit_event.wait() await ctx.exit_event.wait()
console_task.cancel() console_task.cancel()
if ctx.shutdown_task: if ctx.shutdown_task: