puppet/puppetboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

utils.py: Adding logging to utils.py, specifically :func:puppetboard.utils.get_or_abort (#235)

Browse Source 
This fixes https://github.com/voxpupuli/puppetboard/issues/230

If there are any connection issues between PuppetBoard and the PuppetDB
instance there wasn't any obvious evidence in log files. This additional
logging added to utils.py logs errors whenever there is an HTTPError,
ConnectionError or EmptyResponseError in get_or_abort.
This commit is contained in:
Corey Hammerton
2016-05-16 19:59:58 -04:00
parent 3833bbf0a1
commit c1284d21c6
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
puppetboard/utils.py
View File

@@ -2,6 +2,7 @@ from __future__ import absolute_import
from __future__ import unicode_literals from __future__ import unicode_literals
import json import json
import logging
from math import ceil from math import ceil
from requests.exceptions import HTTPError, ConnectionError from requests.exceptions import HTTPError, ConnectionError
@@ -10,6 +11,8 @@ from pypuppetdb.errors import EmptyResponseError
from flask import abort from flask import abort
log = logging.getLogger(__name__)
def jsonprint(value): def jsonprint(value):
return json.dumps(value, indent=2, separators=(',', ': ')) return json.dumps(value, indent=2, separators=(',', ': '))
@@ -23,10 +26,13 @@ def get_or_abort(func, *args, **kwargs):
try: try:
return func(*args, **kwargs) return func(*args, **kwargs)
except HTTPError as e: except HTTPError as e:
log.error(str(e))
abort(e.response.status_code) abort(e.response.status_code)
except ConnectionError: except ConnectionError:
log.error(str(e))
abort(500) abort(500)
except EmptyResponseError: except EmptyResponseError:
log.error(str(e))
abort(204) abort(204)