From 55932afb0069e553916e060e240becf2d5fee190 Mon Sep 17 00:00:00 2001
From: baloola <baloola-mu@hotmail.com>
Date: Wed, 13 Jan 2021 13:45:08 +0100
Subject: [PATCH] enabling more error catching
---
ingestor/app.py | 24 +++++++++++++-----------
ingestor/filedaemon.py | 23 ++++++++++++-----------
2 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/ingestor/app.py b/ingestor/app.py
index 20b5c6b6..bba7ca8f 100644
--- a/ingestor/app.py
+++ b/ingestor/app.py
@@ -80,18 +80,20 @@ queue_name = os.environ['REDIS_PREPROCESS_MD_QUEUE_KEY']
@application.route('/', methods=['POST'])
def ingest():
- request.get_data()
- browse_report = parse_browse_report(request.data)
- logger.debug(browse_report)
- if isinstance(browse_report, str):
- queue_content = browse_report
- filename = queue_content
- else:
- queue_content = json.dumps(
- browse_report, default=converter
- )
- filename = browse_name(browse_report)
+
try:
+ request.get_data()
+ browse_report = parse_browse_report(request.data)
+ logger.debug(browse_report)
+ if isinstance(browse_report, str):
+ queue_content = browse_report
+ filename = queue_content
+ else:
+ queue_content = json.dumps(
+ browse_report, default=converter
+ )
+ filename = browse_name(browse_report)
+
client.lpush(queue_name, queue_content)
save_endpoint_report(filename, request.data, True)
diff --git a/ingestor/filedaemon.py b/ingestor/filedaemon.py
index 05eea01e..8c066c4c 100644
--- a/ingestor/filedaemon.py
+++ b/ingestor/filedaemon.py
@@ -84,17 +84,18 @@ class EventHandler(pyinotify.ProcessEvent):
def process_IN_CLOSE_WRITE(self, event):
logger.info(f'Parsing browse file: {event.pathname}')
- with open(event.pathname) as f:
- browse_report = parse_browse_report(f)
- logger.debug(browse_report)
- if isinstance(browse_report, str):
- queue_content = browse_report
-
- else:
- queue_content = json.dumps(
- browse_report, default=converter
- )
- try:
+ try:
+ with open(event.pathname) as f:
+ browse_report = parse_browse_report(f)
+ logger.debug(browse_report)
+ if isinstance(browse_report, str):
+ queue_content = browse_report
+
+ else:
+ queue_content = json.dumps(
+ browse_report, default=converter
+ )
+
client.lpush(queue_name, queue_content)
save_mount_report(event.pathname, True)
--
GitLab