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

Merge pull request #13334 from cachedout/13328

Browse Source 
Don't decrypt twice
This commit is contained in:
Thomas S Hatch 2014-06-09 13:30:40 -06:00
commit 861b9cd534
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
salt/minion.py
View File

@ -745,13 +745,9 @@ class Minion(MinionBase):
channel = salt.transport.Channel.factory(self.opts)
try:
result = channel.send(load)
try:
data = self.crypticle.loads(result)
except AuthenticationError:
log.info("AES key changed, re-authenticating")
# We can't decode the master's response to our event,
# so we will need to re-authenticate.
self.authenticate()
except AuthenticationError:
log.info("AES key changed, re-authenticating")
self.authenticate()
except SaltReqTimeoutError:
log.info("Master failed to respond. Preforming re-authenticating")
self.authenticate()