Matrix-Mirrors/maubot
1
0
Fork 0
mirror of https://github.com/maubot/maubot.git synced 2024-10-01 01:06:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add support for asyncpg in standalone mode plugin databases

Browse Source
This commit is contained in:
Tulir Asokan 2022-03-26 14:39:56 +02:00
parent adc892aa0d
commit 4685c492a9
1 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
maubot/standalone/__main__.py
View File

@ -38,12 +38,12 @@ from mautrix.types import (
RoomFilter, RoomFilter,
StrippedStateEvent, StrippedStateEvent,
) )
from mautrix.util.async_db import Database from mautrix.util.async_db import Database, Scheme
from mautrix.util.config import BaseMissingError, RecursiveDict from mautrix.util.config import BaseMissingError, RecursiveDict
from mautrix.util.logging import TraceLogger from mautrix.util.logging import TraceLogger
from ..__meta__ import __version__ from ..__meta__ import __version__
from ..loader import PluginMeta from ..loader import DatabaseType, PluginMeta
from ..matrix import MaubotMatrixClient from ..matrix import MaubotMatrixClient
from ..plugin_base import Plugin from ..plugin_base import Plugin
from ..plugin_server import PluginWebApp, PrefixResource from ..plugin_server import PluginWebApp, PrefixResource
@ -123,6 +123,7 @@ db = Database.create(
config["database"], config["database"],
db_args=config.get("database_opts", {}), db_args=config.get("database_opts", {}),
ignore_foreign_tables=True, ignore_foreign_tables=True,
log=logging.getLogger("maubot.db"),
) )
user_id = config["user.credentials.id"] user_id = config["user.credentials.id"]
@ -286,6 +287,27 @@ async def main():
await client.set_displayname(displayname) await client.set_displayname(displayname)
plugin_log = cast(TraceLogger, logging.getLogger("maubot.instance.__main__")) plugin_log = cast(TraceLogger, logging.getLogger("maubot.instance.__main__"))
if meta.database:
if meta.database_type == DatabaseType.SQLALCHEMY:
import sqlalchemy as sql
plugin_db = sql.create_engine(config["database"])
if db.scheme == Scheme.SQLITE:
log.warning(
"Using SQLite with legacy plugins in standalone mode can cause database "
"locking issues. Switching to Postgres or updating the plugin to use the "
"new asyncpg/aiosqlite database interface is recommended."
)
elif meta.database_type == DatabaseType.ASYNCPG:
plugin_db = db
upgrade_table = plugin.get_db_upgrade_table()
if upgrade_table:
await upgrade_table.upgrade(plugin_db)
else:
log.fatal(f"Unsupported database type {meta.database_type}")
sys.exit(13)
else:
plugin_db = None
bot = plugin( bot = plugin(
client=client, client=client,
loop=loop, loop=loop,
@ -293,7 +315,7 @@ async def main():
instance_id="__main__", instance_id="__main__",
log=plugin_log, log=plugin_log,
config=bot_config, config=bot_config,
database=db if meta.database else None, database=plugin_db,
webapp=plugin_webapp, webapp=plugin_webapp,
webapp_url=public_url, webapp_url=public_url,
loader=loader, loader=loader,