From 2c4b356df1157cfd3698e2ade46d913f7ce28f7f Mon Sep 17 00:00:00 2001 From: alex Date: Mon, 16 Jun 2025 22:50:42 +0200 Subject: [PATCH] fix --- load_orchestrator.py | 16 ++++++++-------- utils/parsers/by_type/isi_csv_log_vulink.py | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) create mode 100644 utils/parsers/by_type/isi_csv_log_vulink.py diff --git a/load_orchestrator.py b/load_orchestrator.py index c8e00a4..fa5c81b 100755 --- a/load_orchestrator.py +++ b/load_orchestrator.py @@ -94,20 +94,20 @@ async def load_csv(record: tuple, cfg: object, pool) -> bool: debug_mode = (logging.getLogger().getEffectiveLevel() == logging.DEBUG) logger.debug("Inizio ricerca nuovo CSV da elaborare") - id, unit_type, tool_type, unit_name, tool_name = record - logger.info(f'Trovato CSV da elaborare: ID={id}, Tipo={unit_type.lower().replace(" ", "_")}_{tool_type.lower().replace(" ", "_")}, Nome={unit_name.lower().replace(" ", "_")}_{tool_name.lower().replace(" ", "_")}') + id, unit_type, tool_type, unit_name, tool_name = [x.lower().replace(" ", "_") if isinstance(x, str) else x for x in record] + logger.info(f'Trovato CSV da elaborare: ID={id}, Tipo={unit_type}_{tool_type}, Nome={unit_name}_{tool_name}') # Costruisce il nome del modulo da caricare dinamicamente - module_names = [f'utils.parsers.by_name.{unit_name.lower().replace(" ", "_")}_{tool_name.lower().replace(" ","_")}', - f'utils.parsers.by_name.{unit_name.lower().replace(" ", "_")}_{tool_type.lower().replace(" ","_")}', - f'utils.parsers.by_name.{unit_name.lower().replace(" ", "_")}_all', - f'utils.parsers.by_type.{unit_type.lower().replace(" ", "_")}_{tool_type.lower().replace(" ","_")}'] + module_names = [f'utils.parsers.by_name.{unit_name}_{tool_name}', + f'utils.parsers.by_name.{unit_name}_{tool_type}', + f'utils.parsers.by_name.{unit_name}_all', + f'utils.parsers.by_type.{unit_type}_{tool_type}'] modulo = None for module_name in module_names: try: logger.debug(f"Caricamento dinamico del modulo: {module_name}") modulo = importlib.import_module(module_name) - logger.debug(f"Funzione 'main_loader' caricata dal modulo {module_name}") + logger.info(f"Funzione 'main_loader' caricata dal modulo {module_name}") break except (ImportError, AttributeError) as e: logger.debug(f"Modulo {module_name} non presente o non valido. {e}", exc_info=debug_mode) @@ -159,7 +159,7 @@ async def main(): user=cfg.dbuser, password=cfg.dbpass, db=cfg.dbname, - minsize=1, + minsize=4, maxsize=cfg.max_threads*4, pool_recycle=3600 ) diff --git a/utils/parsers/by_type/isi_csv_log_vulink.py b/utils/parsers/by_type/isi_csv_log_vulink.py new file mode 100644 index 0000000..a0f7c26 --- /dev/null +++ b/utils/parsers/by_type/isi_csv_log_vulink.py @@ -0,0 +1,2 @@ +async def main_loader(cfg: object, id: int, pool) -> None: + pass \ No newline at end of file