From 5b0df41188b1b464fef178168d00052c50861c69 Mon Sep 17 00:00:00 2001 From: Vincent BENOIT Date: Wed, 30 Nov 2022 11:11:55 +0100 Subject: [PATCH] correction de bug sur la connexion avec le serveur IPC AF_UNIX --- ConfBack/infos/views.py | 12 ++++++++---- ConfBack/schedule/views.py | 1 - 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/ConfBack/infos/views.py b/ConfBack/infos/views.py index 4472c8b..ba4d8dd 100644 --- a/ConfBack/infos/views.py +++ b/ConfBack/infos/views.py @@ -118,15 +118,19 @@ def is_alive(): ret = True conn = Sock(addr=current_app.config['UNIX_ADDR'], logger=current_app.logger) if not conn.connect(): - current_app.logger.error("impossible de se connecter au serveur") - abort(status.HTTP_406_NOT_ACCEPTABLE, description="Impossible de se connecter au serveur") + current_app.logger.error("impossible de se connecter au serveur IPC AF_UNIX") + ret = False + content = {'alive':ret} + return jsonify(content), status.HTTP_200_OK current_app.logger.info("envoie de la demande de message de vie ...") # send order to KineIntercom process if not conn.send(b"ALIVE?\n"): conn.disconnect() - current_app.logger.error("impossible de communiquer avec le serveur") - abort(status.HTTP_406_NOT_ACCEPTABLE, description="Impossible de communiquer avec le serveur") + current_app.logger.error("impossible de communiquer avec le serveur IPC AF_UNIX") + ret = False + content = {'alive':ret} + return jsonify(content), status.HTTP_200_OK try: datas = conn.recv_timeout(6, 10) diff --git a/ConfBack/schedule/views.py b/ConfBack/schedule/views.py index ab163c7..10cd5dd 100644 --- a/ConfBack/schedule/views.py +++ b/ConfBack/schedule/views.py @@ -83,7 +83,6 @@ def retreive_scheduler(): for hour in data['HORAIRES'][day]: h.append(hour) content.append({'name': day, 'horaires':h}) - #current_app.logger.debug("{}".format(content)) else: abort(status.HTTP_406_NOT_ACCEPTABLE, description="horaire manquant en base de données") except FileNotFoundError as e: