From 3797aac848e3afc8d23b2229126d43f2ac31d8e8 Mon Sep 17 00:00:00 2001 From: Vadim Troshchinskiy Date: Tue, 17 Jun 2025 14:53:40 +0200 Subject: [PATCH] Fix logging, startup library issues --- interfaceAdm/CrearImagenGit.py | 55 +++++++++++++++++++++++++++++++--- 1 file changed, 51 insertions(+), 4 deletions(-) diff --git a/interfaceAdm/CrearImagenGit.py b/interfaceAdm/CrearImagenGit.py index 06a5c45..5cde5fb 100755 --- a/interfaceAdm/CrearImagenGit.py +++ b/interfaceAdm/CrearImagenGit.py @@ -3,15 +3,43 @@ import os import subprocess import sys import time +import resource -sys.path.insert(0, "/opt/oglive/rootfs/opt/opengnsys/lib/python3/") -sys.path.insert(0, "/opt/opengnsys/interfaceAdm/git/") -sys.path.insert(0, "/opt/opengnsys/ogrepository/oggit/lib/") + +soft, hard = resource.getrlimit(resource.RLIMIT_NOFILE) +try: + # Usamos el mínimo entre 65536 y el límite hard disponible + new_limit = min(65536, hard) + resource.setrlimit(resource.RLIMIT_NOFILE, (new_limit, hard)) + print(f"RLIMIT_NOFILE establecido a: {resource.getrlimit(resource.RLIMIT_NOFILE)}") +except ValueError as e: + print(f"No se pudo aumentar el límite de archivos abiertos: {e}") + +# Añadir rutas personalizadas de forma segura +extra_paths = [ + "/opt/opengnsys/interfaceAdm/git/", + "/opt/opengnsys/ogrepository/oggit/lib/" +] + + +# Si estás completamente seguro de que esta ruta no interfiere con la stdlib +# y contiene todos los módulos necesarios, puedes añadirla AL FINAL del path. +path_maybe_problematic = "/opt/oglive/rootfs/opt/opengnsys/lib/python3/" +if os.path.isdir(path_maybe_problematic): + sys.path.append(path_maybe_problematic) + + for path in extra_paths: + if os.path.isdir(path): + sys.path.append(path) + import NetLib import ogGlobals import SystemLib +import logging + + from gitlib import OpengnsysGitLibrary, NTFSImplementation @@ -26,10 +54,29 @@ def create_image(disk_num, partition_num, repo, image_name): def main(): if len(sys.argv) != 6: - sys.exit(SystemLib.ogRaiseError(OG_ERR_FORMAT, "Incorrect number of arguments")) + sys.exit(SystemLib.ogRaiseError([], ogGlobals.OG_ERR_FORMAT, "Incorrect number of arguments. Usage: CrearImagenGit.py disk_num partition_num image_name repo tag")) disk_num, partition_num, image_name, repo, tag = sys.argv[1:6] + + opengnsys_log_dir = "/opt/opengnsys/log" + ip_address = "unknown" + logFilePath = f"{opengnsys_log_dir}/{ip_address}.CrearImagenGit.log" + + fileLog = logging.FileHandler(logFilePath) + fileLog.setLevel(logging.DEBUG) + + formatter = logging.Formatter('%(asctime)s - %(name)24s - [%(levelname)5s] - %(message)s') + + fileLog.setFormatter(formatter) + + logger = logging.getLogger(__package__) + logger.setLevel(logging.DEBUG) + logger.addHandler(fileLog) + + logger.info("Starting CrearImagenGit") + + retval = create_image(disk_num, partition_num, repo, image_name) sys.exit(retval)