From 899cdff3e8ee26ebbb424d3f979fb1822c887308 Mon Sep 17 00:00:00 2001 From: Henrik Holmboe Date: Thu, 28 Nov 2013 12:59:31 +0100 Subject: [PATCH] Set default HWM in API call as well @basepi set the HWM to 1000 by default in #8804 and this is a complementary commit to that one. It is now obvious that the HWM is 1000 by default in the source code. X-ref: #7662 and #7284 --- salt/master.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/salt/master.py b/salt/master.py index acd9b03f3a..14f13d2175 100644 --- a/salt/master.py +++ b/salt/master.py @@ -412,11 +412,11 @@ class Publisher(multiprocessing.Process): pub_sock = context.socket(zmq.PUB) # if 2.1 >= zmq < 3.0, we only have one HWM setting try: - pub_sock.setsockopt(zmq.HWM, self.opts.get('pub_hwm', 100)) + 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: - pub_sock.setsockopt(zmq.SNDHWM, self.opts.get('pub_hwm', 100)) - pub_sock.setsockopt(zmq.RCVHWM, self.opts.get('pub_hwm', 100)) + pub_sock.setsockopt(zmq.SNDHWM, self.opts.get('pub_hwm', 1000)) + pub_sock.setsockopt(zmq.RCVHWM, self.opts.get('pub_hwm', 1000)) if self.opts['ipv6'] is True and hasattr(zmq, 'IPV4ONLY'): # IPv6 sockets work for both IPv6 and IPv4 addresses pub_sock.setsockopt(zmq.IPV4ONLY, 0)