From 52e66aa17a4abc5d51bba361665bbe22a5922383 Mon Sep 17 00:00:00 2001 From: Artur Basiak Date: Thu, 19 May 2016 13:20:21 +0200 Subject: [PATCH] Raise original exception Raise orginal exception from LogPublisher if proceeding or sending message to kafka fails. Change-Id: I59c4d2fda5bae22b644236673627c18d373d73ac --- monasca_log_api/reference/common/log_publisher.py | 8 +++++++- monasca_log_api/reference/v3/logs.py | 3 +-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/monasca_log_api/reference/common/log_publisher.py b/monasca_log_api/reference/common/log_publisher.py index 4599c339..b646d06e 100644 --- a/monasca_log_api/reference/common/log_publisher.py +++ b/monasca_log_api/reference/common/log_publisher.py @@ -13,6 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. +import falcon import itertools from monasca_common.kafka import producer @@ -182,7 +183,12 @@ class LogPublisher(object): if not bucket: LOG.warn('Empty bucket spotted, continue...') continue - self._kafka_publisher.publish(topic, bucket, key) + try: + self._kafka_publisher.publish(topic, bucket, key) + except Exception as ex: + raise falcon.HTTPServiceUnavailable('Service unavailable', + ex.message, 60) + LOG.debug('Sent %d messages (topics=%s,key=%s)', len(bucket), topic, key) diff --git a/monasca_log_api/reference/v3/logs.py b/monasca_log_api/reference/v3/logs.py index 4fcf90a1..c2f7634e 100644 --- a/monasca_log_api/reference/v3/logs.py +++ b/monasca_log_api/reference/v3/logs.py @@ -131,5 +131,4 @@ class Logs(logs_api.LogsApi): self._log_publisher.send_message(logs) except Exception as ex: LOG.exception(ex) - raise falcon.HTTPServiceUnavailable('Service unavailable', - ex.message, 60) + raise ex