Add addr info to RPCReceiveError locustio#2

locust/exception.py

@@ -68,6 +68,9 @@ class RPCReceiveError(Exception):
 
     When raised from zmqrpc, client connection should be reestablished.
     """
+    def __init__(self, *args: object, addr=None) -> None:
+        super().__init__(*args)
+        self.addr = addr
 
 
 class AuthCredentialsError(ValueError):

locust/rpc/zmqrpc.py

@@ -49,7 +49,7 @@ def recv_from_client(self):
         try:
             msg = Message.unserialize(data[1])
         except (UnicodeDecodeError, msgerr.ExtraData) as e:
-            raise RPCReceiveError(f"ZMQ interrupted or corrupted message from {addr}") from e
+            raise RPCReceiveError("ZMQ interrupted or corrupted message", addr=addr) from e
         return addr, msg
 
     def close(self, linger=None):

locust/runners.py

@@ -989,7 +989,9 @@ def client_listener(self) -> NoReturn:
                 client_id, msg = self.server.recv_from_client()
             except RPCReceiveError as e:
                 # TODO: Add proper reconnect if https://github.com/zeromq/pyzmq/issues/1809 fixed
-                logger.error(f"Unrecognized message detected: {e}")
+                addr = e.addr
+                message = f'{e}' if not addr else f'{e} from {addr}'
+                logger.error(f"Unrecognized message detected: {message}")
                 continue
             except RPCSendError as e:
                 logger.error(f"Error sending reconnect message to worker: {e}. Will reset RPC server.")