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

Fix return interface defaults

Browse Source
This commit is contained in:
Thomas S Hatch 2011-04-16 15:13:35 -06:00
parent 45e5872995
commit 8a8c4c99b5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/client.py
View File

@ -60,7 +60,7 @@ class LocalClient(object):
except:
raise SaltClientError('Failed to read in the salt root key')
def cmd(self, tgt, fun, arg=(), timeout=5, expr_form='glob', ret='master'):
def cmd(self, tgt, fun, arg=(), timeout=5, expr_form='glob', ret=''):
'''
Execute a salt command and return.
'''
@ -185,7 +185,7 @@ class LocalClient(object):
'exsel': self._check_facter_minions
}[expr_form](expr)
def pub(self, tgt, fun, arg=(), expr_form='glob', ret='master'):
def pub(self, tgt, fun, arg=(), expr_form='glob', ret=''):
'''
Take the required arguemnts and publish the given command.
Arguments:

4
salt/minion.py
View File

@ -267,9 +267,9 @@ class Minion(object):
+ ' exception: ' + str(exc))
ret['return'] = exc
ret['jid'] = data['jid']
if data['return']:
if data['ret']:
try:
self.returners[data['return']](ret)
self.returners[data['ret']](ret)
except Exception as exc:
self.opts['logger'].error('The return failed for job'\
+ data['jid'] + ' ' + exc)