tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions Packages Projects Releases Wiki Activity

SQLite dbs now handle concurrent reqs better

Browse Source 
Closes #7
This commit is contained in:
Donkie
2023-06-30 22:27:09 +02:00
parent 1fd89807d4
commit 94d8cbf227
2 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
spoolman/database/database.py
View File

@@ -61,18 +61,15 @@ class Database:
logging.getLogger("sqlalchemy.engine").setLevel(logging.INFO) logging.getLogger("sqlalchemy.engine").setLevel(logging.INFO)
connect_args = {} connect_args = {}
if self.connection_url.drivername == "sqlite": if self.connection_url.drivername == "sqlite+aiosqlite":
connect_args["check_same_thread"] = False connect_args["timeout"] = 60
elif self.connection_url.drivername == "postgresql":
connect_args["options"] = "-c timezone=utc"
connect_args["max_inactive_connection_lifetime"] = 3
self.engine = create_async_engine( self.engine = create_async_engine(
self.connection_url, self.connection_url,
connect_args=connect_args, connect_args=connect_args,
pool_pre_ping=True, pool_pre_ping=True,
) )
self.session_maker = async_sessionmaker(self.engine, autocommit=False, autoflush=True) self.session_maker = async_sessionmaker(self.engine, autocommit=False, autoflush=True, expire_on_commit=False)
__db: Optional[Database] = None __db: Optional[Database] = None

2
tests_integration/tests/test_spool.py
View File

@@ -561,7 +561,7 @@ async def test_use_spool_concurrent(random_filament: dict[str, Any]):
spool = result.json() spool = result.json()
# Execute # Execute
requests = 20 requests = 100
used_weight = 0.5 used_weight = 0.5
async with httpx.AsyncClient() as client: async with httpx.AsyncClient() as client:
tasks = [] tasks = []