Compare commits

..

1 commit

Author SHA1 Message Date
Izalia Mae 89300057ef Merge branch 'sql' into 'master'
Draft: switch database backend to sql

See merge request pleroma/relay!53
2024-01-25 00:55:57 +00:00
4 changed files with 4 additions and 4 deletions

View file

@ -17,11 +17,11 @@ if typing.TYPE_CHECKING:
def get_database(config: Config, migrate: bool = True) -> tinysql.Database: def get_database(config: Config, migrate: bool = True) -> tinysql.Database:
if config.db_type == "sqlite": if config.db_type == "sqlite":
# todo: remove check_same_thread when tinysql stores connections per thread
db = tinysql.Database.sqlite( db = tinysql.Database.sqlite(
config.sqlite_path, config.sqlite_path,
connection_class = Connection, connection_class = Connection,
min_connections = 2, check_same_thread = False
max_connections = 10
) )
elif config.db_type == "postgres": elif config.db_type == "postgres":

View file

@ -143,7 +143,6 @@ class HttpClient:
async def post(self, url: str, message: Message) -> None: async def post(self, url: str, message: Message) -> None:
await self.open() await self.open()
# todo: cache inboxes to avoid opening a db connection
with get_app().database.connection() as conn: with get_app().database.connection() as conn:
instance = conn.get_inbox(url) instance = conn.get_inbox(url)

View file

@ -9,6 +9,7 @@ from aputils.errors import SignatureFailureError
from aputils.misc import Digest, HttpDate, Signature from aputils.misc import Digest, HttpDate, Signature
from aputils.objects import Nodeinfo, Webfinger, WellKnownNodeinfo from aputils.objects import Nodeinfo, Webfinger, WellKnownNodeinfo
from pathlib import Path from pathlib import Path
from urllib.parse import urlparse
from . import __version__ from . import __version__
from . import logger as logging from . import logger as logging

View file

@ -3,4 +3,4 @@ aputils@https://git.barkshark.xyz/barkshark/aputils/archive/0.1.6a.tar.gz
cachetools>=5.2.0 cachetools>=5.2.0
click>=8.1.2 click>=8.1.2
pyyaml>=6.0 pyyaml>=6.0
tinysql@git+https://git.barkshark.xyz/barkshark/tinysql@3d94193ee4 tinysql@https://git.barkshark.xyz/barkshark/tinysql/archive/0.2.1.tar.gz