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

Merge branch '2018.3' into 2018.3

Browse Source
This commit is contained in:
Daniel Wozniak 2019-02-13 11:15:37 -07:00 committed by GitHub
commit 611065e72d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
salt/returners/local_cache.py
View File

@ -77,6 +77,9 @@ def _walk_through(job_dir):
except Exception: except Exception:
log.exception('Failed to deserialize %s', load_path) log.exception('Failed to deserialize %s', load_path)
continue continue
if not job:
log.error('Deserialization of job succeded but there is no data in %s', load_path)
continue
jid = job['jid'] jid = job['jid']
yield jid, job, t_path, final yield jid, job, t_path, final