xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2025-01-14 19:57:50 +00:00
Code Issues Projects Releases Wiki Activity

More gracefully fail when client goes off the rails.

Browse Source 
A client with certain URLs that go off the end of the valid world was
causing exceptions to be thrown not of the set of 'tame' errors.
Denote them as 404 since that is the nature of the failure.
This commit is contained in:
Jarrod Johnson 2014-02-22 22:08:46 -05:00
parent 5dc3bbcddd
commit 2578fd5817
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
confluent/pluginapi.py
View File

@ -27,7 +27,10 @@ pluginmap = {}
def nested_lookup(nestdict, key):
return reduce(dict.__getitem__, key, nestdict)
try:
return reduce(dict.__getitem__, key, nestdict)
except TypeError:
raise exc.NotFoundException("Invalid element requested")
def load_plugins():
@ -155,6 +158,8 @@ def enumerate_node_collection(collectionpath, configmanager):
raise exc.NotFoundException("Invalid element requested")
del collectionpath[0:2]
collection = nested_lookup(noderesources, collectionpath)
if not isinstance(collection, dict):
raise exc.NotFoundException("Invalid element requested")
return iterate_resources(collection)