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

Merge pull request #9720 from SaveTheRbtz/verbose-sign-in

Browse Source 
crypt: log sign_in errors
This commit is contained in:
Thomas S Hatch 2014-01-13 09:37:09 -08:00
commit b463cc0e5b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/crypt.py
View File

@ -336,8 +336,9 @@ class Auth(object):
True,
self.opts['ipv6']
)
except SaltClientError:
except SaltClientError as e:
if safe:
log.warning('SaltClientError: {0}'.format(e))
return 'retry'
raise SaltClientError
@ -349,8 +350,9 @@ class Auth(object):
self.minion_sign_in_payload(),
timeout=timeout
)
except SaltReqTimeoutError:
except SaltReqTimeoutError as e:
if safe:
log.warning('SaltReqTimeoutError: {0}'.format(e))
return 'retry'
raise SaltClientError