Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
SUSE:SLE-15-SP1:Update
salt.25404
fix-62092-catch-zmq.error.zmqerror-to-set-hwm-f...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File fix-62092-catch-zmq.error.zmqerror-to-set-hwm-for-zm.patch of Package salt.25404
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
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor