valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #43882 from kunal-bajpai/fix_couchbase_returner

Browse Source 
Handle possible KeyError in couchbase.get_load
This commit is contained in:
Nicole Thomas 2017-10-03 15:01:26 -04:00 committed by GitHub
commit 820a542a8d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
salt/returners/couchbase_return.py
View File

@ -265,9 +265,12 @@ def get_load(jid):
except couchbase.exceptions.NotFoundError:
return {}
ret = jid_doc.value['load']
if 'minions' in jid_doc.value:
ret = {}
try:
ret = jid_doc.value['load']
ret['Minions'] = jid_doc.value['minions']
except KeyError as e:
log.error(e)
return ret