From 0a5e780546f63b08d12836ad2d118289725aeecf Mon Sep 17 00:00:00 2001 From: Jason SECULA Date: Thu, 10 Jul 2025 16:45:18 +0200 Subject: [PATCH] =?UTF-8?q?Correction=20de=20la=20gestion=20des=20diff?= =?UTF-8?q?=C3=A9rents=20fichiers=20de=20logs=20et=20utilisation=20d'une?= =?UTF-8?q?=20variable=20qui=20r=C3=A9cup=C3=A8re=20l'emplacement=20du=20s?= =?UTF-8?q?cript?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/syncGLPI.py | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/scripts/syncGLPI.py b/scripts/syncGLPI.py index 301e3a1..1d2a2b0 100644 --- a/scripts/syncGLPI.py +++ b/scripts/syncGLPI.py @@ -22,7 +22,7 @@ args = parser.parse_args() if(args.configpath != None and args.configpath != ''): settings = getSettings(args.configpath) else: - settings = getSettings("./conf/settings.conf") + settings = getSettings("{os.path.realpath(os.path.dirname(__file__))}/conf/settings.conf") #=========== Configuration des logs ===========# @@ -46,28 +46,33 @@ formatter = logging.Formatter(fmt='%(asctime)s | %(levelname)s: %(message)s', da # handler pour log dans un fichier if(settings["LOGS"]["Enabled"]): + # File Handler if(settings["LOGS"].get("Path") and settings["LOGS"].get("Path") != ""): fileHandler = logging.FileHandler(f"{settings['LOGS'].get('Path')}syncGLPI.log") fileErrorHandler = logging.FileHandler(f"{settings['LOGS'].get('Path')}syncGLPI-errors.log") fileDoubleHandler = logging.FileHandler(f"{settings['LOGS'].get('Path')}syncGLPI-double.log") fileMissingHandler = logging.FileHandler(f"{settings['LOGS'].get('Path')}syncGLPI-missing.log") else: - fileHandler = logging.FileHandler('./logs/syncGLPI.log') - fileErrorHandler = logging.FileHandler("./logs/syncGLPI-errors.log") - fileDoubleHandler = logging.FileHandler("./logs/syncGLPI-double.log") - fileDoubleHandler = logging.FileHandler("./logs/syncGLPI-missing.log") + fileHandler = logging.FileHandler('{os.path.realpath(os.path.dirname(__file__))}/logs/syncGLPI.log') + fileErrorHandler = logging.FileHandler("{os.path.realpath(os.path.dirname(__file__))}/logs/syncGLPI-errors.log") + fileDoubleHandler = logging.FileHandler("{os.path.realpath(os.path.dirname(__file__))}/logs/syncGLPI-double.log") + fileMissingHandler = logging.FileHandler("{os.path.realpath(os.path.dirname(__file__))}/logs/syncGLPI-missing.log") + + # Set Logging Level to files handler fileHandler.setLevel(logginglevel) - fileHandler.setFormatter(formatter) fileErrorHandler.setLevel(logging.ERROR) - fileErrorHandler.setFormatter(formatter) fileDoubleHandler.setLevel(logging.ERROR) - fileDoubleHandler.setFormatter(formatter) fileMissingHandler.setLevel(logging.ERROR) + # Set Formatter to file handler + fileHandler.setFormatter(formatter) + fileErrorHandler.setFormatter(formatter) + fileDoubleHandler.setFormatter(formatter) fileMissingHandler.setFormatter(formatter) + # Add Handler to loggers logger.addHandler(fileHandler) logger.addHandler(fileErrorHandler) - logger.addHandler(fileDoubleHandler) - logger.addHandler(fileMissingHandler) + loggerDouble.addHandler(fileDoubleHandler) + loggerMissing.addHandler(fileMissingHandler) # handler pour log dans la console if(not args.silent): @@ -79,7 +84,8 @@ if(not args.silent): #======== Paramètres du script ========# # Emplacement du verrou -lockFile = './airwatchSyncGLPI.lock' +nameForLockFile = settings["GLPI"]["UserAgent"].replace(' ', '-') +lockFile = f'{os.path.realpath(os.path.dirname(__file__))}/{nameForLockFile}_SyncGLPI.lock' logger.debug(f"============ Settings ============") logger.debug(f"Airwatch server: {settings['AIRWATCH']['Server']}")