Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
Scott Idem
2023-01-19 16:45:50 -05:00
parent 93f3b4f184
commit 866e89eefa
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/db_sql.py
View File

@@ -32,7 +32,7 @@ except:
@logger_reset @logger_reset
def sql_connect( def sql_connect(
current_db, current_db,
log_lvl: int = logging.WARNING, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log_lvl: int = logging.DEBUG, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
) -> None|bool|int: ) -> None|bool|int:
log.setLevel(log_lvl) log.setLevel(log_lvl)
log.debug(locals()) log.debug(locals())
@@ -53,6 +53,7 @@ def sql_connect(
if current_db: if current_db:
DB = settings.DB DB = settings.DB
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(config.settings.DB)
new_engine = create_engine(url=settings.SQLALCHEMY_DB_URI, pool_size=25, pool_recycle=60, 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=25, pool_recycle=60, pool_pre_ping=True, echo=False, echo_pool=True, isolation_level='READ COMMITTED', connect_args={'connect_timeout': 30})
@@ -60,7 +61,7 @@ def sql_connect(
log.info(f'Created and connected to database: {settings.SQLALCHEMY_DB_URI}') log.info(f'Created and connected to database: {settings.SQLALCHEMY_DB_URI}')
return True return True
else: else:
log.info(f'Could not created and or connect to database') log.warning(f'Could not created and or connect to database')
return False return False
# current_db.engine.dispose() # current_db.engine.dispose()

5
app/main.py
View File

@@ -42,7 +42,7 @@ app = FastAPI(
) )
# log.setLevel(logging.DEBUG) log.setLevel(logging.DEBUG)
# log.debug(config.settings) # log.debug(config.settings)
if aether_cfg_sql_result := sql_select( if aether_cfg_sql_result := sql_select(
@@ -62,6 +62,7 @@ if aether_cfg_sql_result := sql_select(
DB = config.settings.DB DB = config.settings.DB
config.settings.SQLALCHEMY_DB_URI = 'mysql://'+DB['username']+':'+DB['password']+'@'+DB['server']+'/'+DB['name'] config.settings.SQLALCHEMY_DB_URI = 'mysql://'+DB['username']+':'+DB['password']+'@'+DB['server']+'/'+DB['name']
# db_result = sql_connect(config.settings.SQLALCHEMY_DB_URI) # db_result = sql_connect(config.settings.SQLALCHEMY_DB_URI)
log.debug(config.settings.DB)
config.settings.SMTP['server'] = aether_cfg_sql.get('smtp_server') config.settings.SMTP['server'] = aether_cfg_sql.get('smtp_server')
config.settings.SMTP['port'] = aether_cfg_sql.get('smtp_port') config.settings.SMTP['port'] = aether_cfg_sql.get('smtp_port')
@@ -77,7 +78,7 @@ else:
# aether_cfg_sql_result # aether_cfg_sql_result
pass pass
# log.debug(aether_cfg_sql_result) # log.debug(aether_cfg_sql_result)
log.debug(config.settings) # log.debug(config.settings)
# @lru_cache() # @lru_cache()
# def get_settings(): # def get_settings():