DB connection clean up

This commit is contained in:
Scott Idem
2023-03-15 19:15:16 -04:00
parent 9dca404fb0
commit a07c0121df
2 changed files with 4 additions and 4 deletions

View File

@@ -11,7 +11,7 @@ from sqlalchemy.exc import IntegrityError, OperationalError
db_uri = settings.SQLALCHEMY_DB_URI db_uri = settings.SQLALCHEMY_DB_URI
connection_string = db_uri connection_string = db_uri
engine = create_engine(url=connection_string, pool_size=25, pool_recycle=600, pool_pre_ping=True, echo=False, echo_pool=True, isolation_level='READ COMMITTED', connect_args={'connect_timeout': 30}) engine = create_engine(url=connection_string, pool_size=5, max_overflow=10, pool_recycle=3600, pool_pre_ping=True, echo=False, echo_pool=True, isolation_level='READ COMMITTED', connect_args={'connect_timeout': 30})
# NOTE: The default isolation_level is 'REPEATABLE READ'. This can sometimes not show updated data. # NOTE: The default isolation_level is 'REPEATABLE READ'. This can sometimes not show updated data.
# NOTE: The "echo" set to True option shows the SQL queries. # NOTE: The "echo" set to True option shows the SQL queries.
@@ -55,7 +55,7 @@ def sql_connect(
settings.SQLALCHEMY_DB_URI = 'mysql://'+DB['username']+':'+DB['password']+'@'+DB['server']+'/'+DB['name'] settings.SQLALCHEMY_DB_URI = 'mysql://'+DB['username']+':'+DB['password']+'@'+DB['server']+'/'+DB['name']
log.debug(settings.DB) log.debug(settings.DB)
new_engine = create_engine(url=settings.SQLALCHEMY_DB_URI, pool_size=25, pool_recycle=3660, pool_pre_ping=True, echo=False, echo_pool=True, isolation_level='READ COMMITTED', connect_args={'connect_timeout': 30}) new_engine = create_engine(url=settings.SQLALCHEMY_DB_URI, pool_size=5, max_overflow=10, pool_recycle=3600, pool_pre_ping=True, echo=False, echo_pool=True, isolation_level='READ COMMITTED', connect_args={'connect_timeout': 30})
current_db.engine = new_engine current_db.engine = new_engine
log.info(f'Created and connected to database: {settings.SQLALCHEMY_DB_URI}') log.info(f'Created and connected to database: {settings.SQLALCHEMY_DB_URI}')

View File

@@ -10,8 +10,8 @@ from functools import lru_cache
from pydantic import BaseModel, EmailStr, Field from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union from typing import Dict, List, Optional, Set, Union
from sqlalchemy import create_engine, text # from sqlalchemy import create_engine, text
from sqlalchemy.exc import IntegrityError, OperationalError # from sqlalchemy.exc import IntegrityError, OperationalError
from . import config from . import config
# from app.lib_general import common_route_params, Common_Route_Params # from app.lib_general import common_route_params, Common_Route_Params