agatha/maubot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle startup errors and missing config meta flags

Browse Source
This commit is contained in:
Tulir Asokan 2021-11-20 01:30:03 +02:00
parent c8ae7cd9f5
commit f2bae18c7a
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
maubot/standalone/__main__.py
View File

@ -123,6 +123,10 @@ if not nb:
nb.insert() nb.insert()
bot_config = None bot_config = None
if not meta.config and "base-config.yaml" in meta.extra_files:
log.warning("base-config.yaml in extra files, but config is not set to true. "
"Assuming legacy plugin and loading config.")
meta.config = True
if meta.config: if meta.config:
log.debug("Loading config") log.debug("Loading config")
config_class = plugin.get_config_class() config_class = plugin.get_config_class()
@ -255,9 +259,15 @@ async def main():
await bot.internal_start() await bot.internal_start()
async def stop() -> None: async def stop(suppress_stop_error: bool = False) -> None:
if client:
client.stop() client.stop()
if bot:
try:
await bot.internal_stop() await bot.internal_stop()
except Exception:
if not suppress_stop_error:
log.exception("Error stopping bot")
if crypto_db: if crypto_db:
await crypto_db.stop() await crypto_db.stop()
if web_runner: if web_runner:
@ -270,6 +280,8 @@ try:
loop.run_until_complete(main()) loop.run_until_complete(main())
except Exception: except Exception:
log.fatal("Failed to start plugin", exc_info=True) log.fatal("Failed to start plugin", exc_info=True)
loop.run_until_complete(stop(suppress_stop_error=True))
loop.close()
sys.exit(1) sys.exit(1)
signal.signal(signal.SIGINT, signal.default_int_handler) signal.signal(signal.SIGINT, signal.default_int_handler)