Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

more configurable engine on calling #134

Merged
merged 5 commits into from
Oct 15, 2024
Merged

more configurable engine on calling #134

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d0cf8a
more configurable engine on call
alex75 Oct 11, 2024
abcb52a
add ensure_engine
alex75 Oct 11, 2024
0ef931f
style
alex75 Oct 11, 2024
a67e6d2
better case pool_size -1
alex75 Oct 11, 2024
ccfa13f
default pool timeout to sqlalchemy default
alex75 Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cads_catalogue/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ class SqlalchemySettings:
catalogue_db_host_read: str | None = None
catalogue_db_name: str | None = None
pool_recycle: int = 60
pool_size: int = 5
pool_timeout: float = 1.0
max_overflow: int = 15

def __init__(self, **kwargs):
self.match_args = kwargs
Expand Down
14 changes: 10 additions & 4 deletions cads_catalogue/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,12 +406,18 @@ def ensure_session_obj(read_only: bool = False) -> sa.orm.sessionmaker:
"""
settings = config.ensure_settings(config.dbsettings)
if read_only:
engine = sa.create_engine(
settings.connection_string_read, pool_recycle=settings.pool_recycle
)
connection_string = settings.connection_string_read
else:
connection_string = settings.connection_string
if settings.pool_size == -1:
engine = sa.create_engine(connection_string, poolclass=sa.pool.NullPool)
else:
engine = sa.create_engine(
settings.connection_string, pool_recycle=settings.pool_recycle
connection_string,
pool_recycle=settings.pool_recycle,
pool_size=settings.pool_size,
pool_timeout=settings.pool_timeout,
max_overflow=settings.max_overflow,
)
session_obj = sa.orm.sessionmaker(engine)
return session_obj
Expand Down