Matrix-Mirrors/pantalaimon
1
0
Fork 0
mirror of https://github.com/matrix-org/pantalaimon.git synced 2025-02-14 05:41:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

main: Turn the daemon startup function async.

Browse Source 
This removes removes the loop argument from the janus queue creation.

This fixes #49.
This commit is contained in:
Damir Jelić 2020-04-29 16:23:10 +02:00
parent 04569f9467
commit ed942187d4
1 changed files with 39 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
pantalaimon/main.py
View File

@ -132,24 +132,7 @@ async def message_router(receive_queue, send_queue, proxies):
await proxy.receive_message(message) await proxy.receive_message(message)
@click.command( async def daemon(context, log_level, debug_encryption, config, data_path):
help=(
"pantalaimon is a reverse proxy for matrix homeservers that "
"transparently encrypts and decrypts messages for clients that "
"connect to pantalaimon."
)
)
@click.version_option(version="0.5.1", prog_name="pantalaimon")
@click.option(
"--log-level",
type=click.Choice(["error", "warning", "info", "debug"]),
default=None,
)
@click.option("--debug-encryption", is_flag=True)
@click.option("-c", "--config", type=click.Path(exists=True))
@click.option("--data-path", type=click.Path(exists=True))
@click.pass_context
def main(context, log_level, debug_encryption, config, data_path):
loop = asyncio.get_event_loop() loop = asyncio.get_event_loop()
conf_dir = user_config_dir("pantalaimon", "") conf_dir = user_config_dir("pantalaimon", "")
@ -185,8 +168,8 @@ def main(context, log_level, debug_encryption, config, data_path):
if UI_ENABLED: if UI_ENABLED:
from pantalaimon.ui import GlibT from pantalaimon.ui import GlibT
pan_queue = janus.Queue(loop=loop) pan_queue = janus.Queue()
ui_queue = janus.Queue(loop=loop) ui_queue = janus.Queue()
glib_thread = GlibT( glib_thread = GlibT(
pan_queue.sync_q, pan_queue.sync_q,
@ -197,7 +180,7 @@ def main(context, log_level, debug_encryption, config, data_path):
) )
glib_fut = loop.run_in_executor(None, glib_thread.run) glib_fut = loop.run_in_executor(None, glib_thread.run)
message_router_task = loop.create_task( message_router_task = asyncio.create_task(
message_router(ui_queue.async_q, pan_queue.async_q, proxies) message_router(ui_queue.async_q, pan_queue.async_q, proxies)
) )
@ -209,11 +192,8 @@ def main(context, log_level, debug_encryption, config, data_path):
message_router_task = None message_router_task = None
try: try:
for server_conf in pan_conf.servers.values(): for server_conf in pan_conf.servers.values():
proxy, runner, site = loop.run_until_complete( proxy, runner, site = await init(data_dir, server_conf, pan_queue, ui_queue)
init(data_dir, server_conf, pan_queue, ui_queue)
)
servers.append((proxy, runner, site)) servers.append((proxy, runner, site))
proxies.append(proxy) proxies.append(proxy)
@ -227,6 +207,8 @@ def main(context, log_level, debug_encryption, config, data_path):
home = os.path.expanduser("~") home = os.path.expanduser("~")
os.chdir(home) os.chdir(home)
event = asyncio.Event()
def handler(signum, frame): def handler(signum, frame):
raise KeyboardInterrupt raise KeyboardInterrupt
@ -238,23 +220,48 @@ def main(context, log_level, debug_encryption, config, data_path):
f"======== Starting daemon for homeserver " f"======== Starting daemon for homeserver "
f"{proxy.name} on {site.name} ========" f"{proxy.name} on {site.name} ========"
) )
loop.run_until_complete(site.start()) await site.start()
click.echo("(Press CTRL+C to quit)") click.echo("(Press CTRL+C to quit)")
loop.run_forever() await event.wait()
except KeyboardInterrupt: except (KeyboardInterrupt, asyncio.CancelledError):
for _, runner, _ in servers: for _, runner, _ in servers:
loop.run_until_complete(runner.cleanup()) await runner.cleanup()
if glib_fut: if glib_fut:
loop.run_until_complete(wait_for_glib(glib_thread, glib_fut)) await wait_for_glib(glib_thread, glib_fut)
if message_router_task: if message_router_task:
message_router_task.cancel() message_router_task.cancel()
loop.run_until_complete(asyncio.wait({message_router_task})) await asyncio.wait({message_router_task})
loop.close() raise
@click.command(
help=(
"pantalaimon is a reverse proxy for matrix homeservers that "
"transparently encrypts and decrypts messages for clients that "
"connect to pantalaimon."
)
)
@click.version_option(version="0.5.1", prog_name="pantalaimon")
@click.option(
"--log-level",
type=click.Choice(["error", "warning", "info", "debug"]),
default=None,
)
@click.option("--debug-encryption", is_flag=True)
@click.option("-c", "--config", type=click.Path(exists=True))
@click.option("--data-path", type=click.Path(exists=True))
@click.pass_context
def main(context, log_level, debug_encryption, config, data_path):
event = asyncio.Event()
try:
asyncio.run(daemon(context, log_level, debug_encryption, config, data_path))
except (KeyboardInterrupt, asyncio.CancelledError):
pass
return
if __name__ == "__main__": if __name__ == "__main__":
main() main()