File fix-62092-catch-zmq.error.zmqerror-to-set-hwm-f... of Package salt

Overview Repositories Revisions Requests Users Attributes Meta

File fix-62092-catch-zmq.error.zmqerror-to-set-hwm-for-zm.patch of Package salt (Revision 06dcd449e66ac63b31abe464acd66313)

Currently displaying revision 06dcd449e66ac63b31abe464acd66313 , Show latest

From df474d3cc0a5f02591fea093f9efc324c6feef46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pablo=20Su=C3=A1rez=20Hern=C3=A1ndez?=
 <psuarezhernandez@suse.com>
Date: Thu, 7 Jul 2022 11:38:09 +0100
Subject: [PATCH] Fix #62092: Catch zmq.error.ZMQError to set HWM for
 zmq >= 3 (#543)

It looks like before release 23.0.0, when trying to access zmq.HWM it
was raising ``AttributeError``, which is now wrapped under pyzmq's own
``zmq.error.ZMQError``.
Simply caching that, should then set the HWM correctly for zmq >= 3
and therefore fix #62092.

Co-authored-by: Mircea Ulinic <mulinic@digitalocean.com>
---
 salt/transport/zeromq.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/salt/transport/zeromq.py b/salt/transport/zeromq.py
index 9e61b23255..aa06298ee1 100644
--- a/salt/transport/zeromq.py
+++ b/salt/transport/zeromq.py
@@ -898,7 +898,7 @@ class ZeroMQPubServerChannel(salt.transport.server.PubServerChannel):
         try:
             pub_sock.setsockopt(zmq.HWM, self.opts.get("pub_hwm", 1000))
         # in zmq >= 3.0, there are separate send and receive HWM settings
-        except AttributeError:
+        except (AttributeError, zmq.error.ZMQError):
             # Set the High Water Marks. For more information on HWM, see:
             # http://api.zeromq.org/4-1:zmq-setsockopt
             pub_sock.setsockopt(zmq.SNDHWM, self.opts.get("pub_hwm", 1000))
-- 
2.36.1

Places

File fix-62092-catch-zmq.error.zmqerror-to-set-hwm-for-zm.patch of Package salt (Revision 06dcd449e66ac63b31abe464acd66313)

Places