mirror of
https://github.com/valitydev/salt.git
synced 2024-11-08 09:23:56 +00:00
More returner fixes for redis
This commit is contained in:
parent
ce2f87f9d1
commit
870933951f
@ -287,7 +287,7 @@ class Minion(object):
|
||||
try:
|
||||
self.returners[data['ret']](ret)
|
||||
except Exception as exc:
|
||||
self.opts['logger'].error('The return failed for job'\
|
||||
self.opts['logger'].error('The return failed for job '\
|
||||
+ data['jid'] + ' ' + str(exc))
|
||||
else:
|
||||
self._return_pub(ret)
|
||||
@ -318,7 +318,7 @@ class Minion(object):
|
||||
try:
|
||||
self.returners[data['ret']](ret)
|
||||
except Exception as exc:
|
||||
self.opts['logger'].error('The return failed for job'\
|
||||
self.opts['logger'].error('The return failed for job '\
|
||||
+ data['jid'] + ' ' + str(exc))
|
||||
else:
|
||||
self._return_pub(ret)
|
||||
|
@ -21,4 +21,4 @@ def returner(ret):
|
||||
host=__opts__['redis.host'],
|
||||
port=__opts__['redis.port'],
|
||||
db=__opts__['redis.db'])
|
||||
serv.set(ret['id'] + ':' + red['jid'], json.dumps(ret['return']))
|
||||
serv.set(ret['id'] + ':' + ret['jid'], json.dumps(ret['return']))
|
||||
|
Loading…
Reference in New Issue
Block a user