From 85e219529737f59db68cf5a18ae7775046546154 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 15 Feb 2022 11:37:53 -0500 Subject: [PATCH] General code clean up for easier debugging. --- app/db_sql.py | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/app/db_sql.py b/app/db_sql.py index 2c50c59..7c9571c 100644 --- a/app/db_sql.py +++ b/app/db_sql.py @@ -38,9 +38,9 @@ def sql_insert( table_name: str|None = None, rm_id_random: bool = False, id_random_length: int = 8, + log_lvl: int = logging.WARNING, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL ): - log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(locals()) + log.setLevel(log_lvl) if sql: log.info(f'SQL INSERT using sql string.') @@ -179,7 +179,6 @@ def sql_update( log_lvl: int = logging.WARNING, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL ): log.setLevel(log_lvl) - log.debug(locals()) if sql: sql_update = text(sql) @@ -316,9 +315,9 @@ def sql_insert_or_update( table_name: str|None = None, rm_id_random: bool = False, id_random_length: int|None = None, + log_lvl: int = logging.WARNING, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL ): - log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(locals()) + log.setLevel(log_lvl) #if sql: pass #else: @@ -694,10 +693,10 @@ def sql_delete( field_name: str|None = None, field_value = None, sql: str|None = None, - data: dict|None = None + data: dict|None = None, + log_lvl: int = logging.WARNING, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL ): - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(locals()) + log.setLevel(log_lvl) if table_name and (record_id or record_id_random) and not (field_name or field_value or sql or data): # Delete all records from a table with an ID (auto or random) @@ -849,9 +848,9 @@ def redis_lookup_id_random( record_id_random: int|str, table_name: str, check_int_id: bool = False, + log_lvl: int = logging.WARNING, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL ) -> str|int|bool|None: - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(locals()) + log.setLevel(log_lvl) if isinstance(record_id_random, str) and len(record_id_random) >= 11 and len(record_id_random) <= 22: pass elif isinstance(record_id_random, int): @@ -947,10 +946,10 @@ def redis_lookup_id_random( @logger_reset def get_id_random( record_id: int, - table_name: str + table_name: str, + log_lvl: int = logging.WARNING, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL ) -> str|bool|None: - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(locals()) + log.setLevel(lo_lvl) data = { 'id': record_id } sql = f""" @@ -994,10 +993,10 @@ def get_id_random( # This really needs to be simplified... Use a list of dicts instead. Can store as JSON in the DB. @logger_reset def lookup_id_random_pop( - obj_data: dict + obj_data: dict, + log_lvl: int = logging.WARNING, # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL ): - log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(locals()) + log.setLevel(log_lvl) if 'account_id_random' in obj_data: obj_data['account_id'] = redis_lookup_id_random(record_id_random=obj_data['account_id_random'], table_name='account')