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 #31239 from terminalmage/better-bad-load-logging

Browse Source 
Improve logging when master cannot decode a payload
This commit is contained in:
Mike Place 2016-02-16 09:35:45 -07:00
commit 60bbac36fa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
salt/transport/zeromq.py
View File

@ -512,8 +512,8 @@ class ZeroMQReqServerChannel(salt.transport.mixins.auth.AESReqServerMixin, salt.
try:
payload = self.serial.loads(payload[0])
payload = self._decode_payload(payload)
except Exception as e:
log.error('Bad load from minion')
except Exception as exc:
log.error('Bad load from minion: %s: %s', type(exc).__name__, exc)
stream.send(self.serial.dumps('bad load'))
raise tornado.gen.Return()