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

Make jobs.active work correctly.

Browse Source 
* Fixed output of running minions (#9526)
* Correctly identify returned minions.
This commit is contained in:
Mike Place 2014-04-16 12:49:17 -06:00
parent c30981e8d2
commit b6daf39058
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/runners/jobs.py
View File

@ -34,7 +34,7 @@ def active():
for job in data:
if not job['jid'] in ret:
ret[job['jid']] = _format_job_instance(job)
ret[job['jid']].update({'Running': [], 'Returned': []})
ret[job['jid']].update({'Running': [{minion: job.get('pid', None)}], 'Returned': []})
else:
ret[job['jid']]['Running'].append({minion: job['pid']})
for jid in ret:
@ -45,7 +45,7 @@ def active():
if not os.path.isdir(jid_dir):
continue
for minion in os.listdir(jid_dir):
if minion.startswith('.'):
if minion.startswith('.') or minion == 'jid':
continue
if os.path.exists(os.path.join(jid_dir, minion)):
ret[jid]['Returned'].append(minion)