saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

salt.returners.couchbase_return: move minion list updates to new save_minions() func

Browse source
This commit is contained in:
Erik Johnson 2016-03-03 21:31:32 -06:00
parent f731dc5d32
commit 084a78407a
1 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
salt/returners/couchbase_return.py
View file

@ -124,7 +124,8 @@ def _get_ttl():
def prep_jid(nocache=False, passed_jid=None):
'''
Return a job id and prepare the job id directory
This is the function responsible for making sure jids don't collide (unless its passed a jid)
This is the function responsible for making sure jids don't collide (unless
its passed a jid)
So do what you have to do to make sure that stays the case
'''
if passed_jid is None:
@ -195,6 +196,9 @@ def save_load(jid, clear_load):
log.warning('Could not write job cache file for jid: {0}'.format(jid))
return False
jid_doc.value['load'] = clear_load
cb_.replace(str(jid), jid_doc.value, cas=jid_doc.cas, ttl=_get_ttl())
# if you have a tgt, save that for the UI etc
if 'tgt' in clear_load:
ckminions = salt.utils.minions.CkMinions(__opts__)
@ -203,16 +207,24 @@ def save_load(jid, clear_load):
clear_load['tgt'],
clear_load.get('tgt_type', 'glob')
)
# save the minions to a cache so we can see in the UI
jid_doc.value['minions'] = minions
save_minions(jid, minions)
jid_doc.value['load'] = clear_load
cb_.replace(str(jid),
jid_doc.value,
cas=jid_doc.cas,
ttl=_get_ttl()
)
def save_minions(jid, minions):
'''
Save/update the minion list for a given jid
'''
cb_ = _get_connection()
try:
jid_doc = cb_.get(str(jid))
except couchbase.exceptions.NotFoundError:
log.warning('Could not write job cache file for jid: {0}'.format(jid))
return False
# save the minions to a cache so we can see in the UI
jid_doc.value['minions'] = minions
cb_.replace(str(jid), jid_doc.value, cas=jid_doc.cas, ttl=_get_ttl())
def get_load(jid):