archive/pillar
0
0
Fork 0
Code Issues 42 Pull Requests Projects Releases Wiki Activity

Be more graceful when URLer service isn't configured properly.

Browse Source 
Errors are still logged, but find_url_for_node() will just act as if the
node doesn't exist when the URLer authentication token is invalid.
This commit is contained in:
Sybren A. Stüvel 2017-09-13 15:22:04 +02:00
parent f650835c07
commit 6488f4677e
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pillar/web/nodes/finders.py
View File

@ -3,6 +3,7 @@
import logging import logging
from flask import current_app, url_for from flask import current_app, url_for
import werkzeug.exceptions as wz_exceptions
import pillarsdk import pillarsdk
from pillarsdk import Node from pillarsdk import Node
@ -105,8 +106,13 @@ def project_url(project_id, project):
urler_api = system_util.pillar_api( urler_api = system_util.pillar_api(
token=current_app.config['URLER_SERVICE_AUTH_TOKEN']) token=current_app.config['URLER_SERVICE_AUTH_TOKEN'])
return pillarsdk.Project.find_from_endpoint(
'/service/urler/%s' % project_id, api=urler_api) try:
return pillarsdk.Project.find_from_endpoint(
'/service/urler/%s' % project_id, api=urler_api)
except pillarsdk.ForbiddenAccess as ex:
log.error('URLER request to find URL for project %s failed: %s', project_id, ex)
raise wz_exceptions.NotFound()
# Cache the actual URL based on the node ID, for the duration of the request. # Cache the actual URL based on the node ID, for the duration of the request.