iartamonov/mautrix-telegram
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Move stopping into prepare_stop and stop custom puppet syncs

Browse Source
This commit is contained in:
Tulir Asokan
2019-08-06 20:09:29 +03:00
parent 299d20aac9
commit 45f1dddb81
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mautrix_telegram/__main__.py
+5 -4
View File
@@ -30,7 +30,7 @@ from .db import init as init_db
from .formatter import init as init_formatter from .formatter import init as init_formatter
from .matrix import MatrixHandler from .matrix import MatrixHandler
from .portal import init as init_portal from .portal import init as init_portal
from .puppet import init as init_puppet from .puppet import Puppet, init as init_puppet
from .sqlstatestore import SQLStateStore from .sqlstatestore import SQLStateStore
from .user import User, init as init_user from .user import User, init as init_user
from . import __version__ from . import __version__
@@ -94,9 +94,10 @@ class TelegramBridge(Bridge):
bot_startup = [self.bot.start()] if self.bot else [] bot_startup = [self.bot.start()] if self.bot else []
self.startup_actions = chain(puppet_startup, user_startup, bot_startup) self.startup_actions = chain(puppet_startup, user_startup, bot_startup)
async def stop(self) -> None: def prepare_stop(self) -> None:
self.shutdown_actions = [user.stop() for user in User.by_tgid.values()] for puppet in Puppet.by_custom_mxid.values():
await super().stop() puppet.stop()
self.shutdown_actions = (user.stop() for user in User.by_tgid.values())
TelegramBridge().run() TelegramBridge().run()