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

Backport the fix in #20781 manually to the 2014.7 branch

Browse Source
This commit is contained in:
rallytime 2015-03-20 11:21:10 -06:00
parent fd3623d9fc
commit ba0560e526
1 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
salt/modules/mine.py
View File

@ -22,7 +22,11 @@ def _auth():
Return the auth object
'''
if 'auth' not in __context__:
__context__['auth'] = salt.crypt.SAuth(__opts__)
try:
__context__['auth'] = salt.crypt.SAuth(__opts__)
except SaltClientError:
log.error('Could not authenticate with master. Mine data '
'will not be transmitted.')
return __context__['auth']
@ -96,7 +100,12 @@ def update(clear=False):
'clear': clear,
}
if __opts__.get('transport', '') == 'zeromq':
load['tok'] = _auth().gen_token('salt')
try:
load['tok'] = _auth().gen_token('salt')
except AttributeError:
log.error('Mine could not authenticate with master. Mine data '
'not sent.')
return False
sreq = salt.transport.Channel.factory(__opts__)
ret = sreq.send(load)
return ret
@ -148,7 +157,12 @@ def send(func, *args, **kwargs):
'id': __opts__['id'],
}
if __opts__.get('transport', '') == 'zeromq':
load['tok'] = _auth().gen_token('salt')
try:
load['tok'] = _auth().gen_token('salt')
except AttributeError:
log.error('Mine could not authenticate with master. Mine data '
'not sent.')
return False
sreq = salt.transport.Channel.factory(__opts__)
ret = sreq.send(load)
return ret
@ -203,7 +217,12 @@ def get(tgt, fun, expr_form='glob'):
'expr_form': expr_form,
}
if __opts__.get('transport', '') == 'zeromq':
load['tok'] = _auth().gen_token('salt')
try:
load['tok'] = _auth().gen_token('salt')
except AttributeError:
log.error('Mine could not authenticate with master. Mine data '
'not sent.')
return False
sreq = salt.transport.Channel.factory(__opts__)
ret = sreq.send(load)
return ret
@ -230,7 +249,12 @@ def delete(fun):
'fun': fun,
}
if __opts__.get('transport', '') == 'zeromq':
load['tok'] = _auth().gen_token('salt')
try:
load['tok'] = _auth().gen_token('salt')
except AttributeError:
log.error('Mine could not authenticate with master. Mine data '
'not sent.')
return False
sreq = salt.transport.Channel.factory(__opts__)
ret = sreq.send(load)
return ret
@ -253,7 +277,12 @@ def flush():
'id': __opts__['id'],
}
if __opts__.get('transport', '') == 'zeromq':
load['tok'] = _auth().gen_token('salt')
try:
load['tok'] = _auth().gen_token('salt')
except AttributeError:
log.error('Mine could not authenticate with master. Mine data '
'not sent.')
return False
sreq = salt.transport.Channel.factory(__opts__)
ret = sreq.send(load)
return ret