emitlinks/glpi-airwatch-sync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Correction de la gestion des différents fichiers de logs et utilisation d'une variable qui récupère l'emplacement du script

Browse Source
This commit is contained in:
Jason SECULA
2025-07-10 16:45:18 +02:00
parent ce003e206a
commit 0a5e780546
1 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
scripts/syncGLPI.py
View File

@ -22,7 +22,7 @@ args = parser.parse_args()
if(args.configpath != None and args.configpath != ''): if(args.configpath != None and args.configpath != ''):
settings = getSettings(args.configpath) settings = getSettings(args.configpath)
else: else:
settings = getSettings("./conf/settings.conf") settings = getSettings("{os.path.realpath(os.path.dirname(__file__))}/conf/settings.conf")
#=========== Configuration des logs ===========# #=========== Configuration des logs ===========#
@ -46,28 +46,33 @@ formatter = logging.Formatter(fmt='%(asctime)s | %(levelname)s: %(message)s', da
# handler pour log dans un fichier # handler pour log dans un fichier
if(settings["LOGS"]["Enabled"]): if(settings["LOGS"]["Enabled"]):
# File Handler
if(settings["LOGS"].get("Path") and settings["LOGS"].get("Path") != ""): if(settings["LOGS"].get("Path") and settings["LOGS"].get("Path") != ""):
fileHandler = logging.FileHandler(f"{settings['LOGS'].get('Path')}syncGLPI.log") fileHandler = logging.FileHandler(f"{settings['LOGS'].get('Path')}syncGLPI.log")
fileErrorHandler = logging.FileHandler(f"{settings['LOGS'].get('Path')}syncGLPI-errors.log") fileErrorHandler = logging.FileHandler(f"{settings['LOGS'].get('Path')}syncGLPI-errors.log")
fileDoubleHandler = logging.FileHandler(f"{settings['LOGS'].get('Path')}syncGLPI-double.log") fileDoubleHandler = logging.FileHandler(f"{settings['LOGS'].get('Path')}syncGLPI-double.log")
fileMissingHandler = logging.FileHandler(f"{settings['LOGS'].get('Path')}syncGLPI-missing.log") fileMissingHandler = logging.FileHandler(f"{settings['LOGS'].get('Path')}syncGLPI-missing.log")
else: else:
fileHandler = logging.FileHandler('./logs/syncGLPI.log') fileHandler = logging.FileHandler('{os.path.realpath(os.path.dirname(__file__))}/logs/syncGLPI.log')
fileErrorHandler = logging.FileHandler("./logs/syncGLPI-errors.log") fileErrorHandler = logging.FileHandler("{os.path.realpath(os.path.dirname(__file__))}/logs/syncGLPI-errors.log")
fileDoubleHandler = logging.FileHandler("./logs/syncGLPI-double.log") fileDoubleHandler = logging.FileHandler("{os.path.realpath(os.path.dirname(__file__))}/logs/syncGLPI-double.log")
fileDoubleHandler = logging.FileHandler("./logs/syncGLPI-missing.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.setLevel(logginglevel)
fileHandler.setFormatter(formatter)
fileErrorHandler.setLevel(logging.ERROR) fileErrorHandler.setLevel(logging.ERROR)
fileErrorHandler.setFormatter(formatter)
fileDoubleHandler.setLevel(logging.ERROR) fileDoubleHandler.setLevel(logging.ERROR)
fileDoubleHandler.setFormatter(formatter)
fileMissingHandler.setLevel(logging.ERROR) fileMissingHandler.setLevel(logging.ERROR)
# Set Formatter to file handler
fileHandler.setFormatter(formatter)
fileErrorHandler.setFormatter(formatter)
fileDoubleHandler.setFormatter(formatter)
fileMissingHandler.setFormatter(formatter) fileMissingHandler.setFormatter(formatter)
# Add Handler to loggers
logger.addHandler(fileHandler) logger.addHandler(fileHandler)
logger.addHandler(fileErrorHandler) logger.addHandler(fileErrorHandler)
logger.addHandler(fileDoubleHandler) loggerDouble.addHandler(fileDoubleHandler)
logger.addHandler(fileMissingHandler) loggerMissing.addHandler(fileMissingHandler)
# handler pour log dans la console # handler pour log dans la console
if(not args.silent): if(not args.silent):
@ -79,7 +84,8 @@ if(not args.silent):
#======== Paramètres du script ========# #======== Paramètres du script ========#
# Emplacement du verrou # 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"============ Settings ============")
logger.debug(f"Airwatch server: {settings['AIRWATCH']['Server']}") logger.debug(f"Airwatch server: {settings['AIRWATCH']['Server']}")