From 1fbe3cba1f91f8a16bf1560836bb56df82f29475 Mon Sep 17 00:00:00 2001 From: Erik Johnson Date: Tue, 16 Feb 2016 09:33:28 -0600 Subject: [PATCH] Improve logging when master cannot decode a payload This includes the exception type and message in the log message instead of simply logging "Bad load from minion". --- salt/transport/zeromq.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py index 5ae363b4e1..57de073306 100644 --- a/salt/transport/zeromq.py +++ b/salt/transport/zeromq.py @@ -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()