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

Merge pull request #38610 from yue9944882/2016.11

Browse source 
Fix #38595 - Unexpected error log from redis retuner in master's log
This commit is contained in:
Mike Place 2017-01-06 14:47:21 -07:00 • committed by GitHub
commit b13cd1370f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
salt/returners/redis_return.py
View file

@ -227,7 +227,8 @@ def clean_old_jobs():
load_key = ret_key.replace('ret:', 'load:', 1)
if load_key not in living_jids:
to_remove.append(ret_key)
serv.delete(*to_remove)
if len(to_remove) != 0:
serv.delete(*to_remove)
def prep_jid(nocache=False, passed_jid=None): # pylint: disable=unused-argument