From c5d0ae843f5677469e6085d29a719d749865db1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Fri, 3 Mar 2017 12:19:27 +0100 Subject: [PATCH] Either raise or log, not both --- pillarsdk/api.py | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pillarsdk/api.py b/pillarsdk/api.py index a8d6ddf..700e4d8 100644 --- a/pillarsdk/api.py +++ b/pillarsdk/api.py @@ -107,17 +107,8 @@ class Api(object): """Makes a http call. Logs response information. """ - try: - response = self.requests_session.request(method, url, **kwargs) - except Exception as ex: - log.warning('Error performing HTTP %s request to %s: %s', method, url, str(ex)) - raise - - try: - content = self.handle_response(response, response.text) - except: - log.info("Response[%s]: %s", response.status_code, response.reason) - raise + response = self.requests_session.request(method, url, **kwargs) + content = self.handle_response(response, response.text) return content