valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Set default HWM in API call as well

Browse Source 
@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
This commit is contained in:
Henrik Holmboe 2013-11-28 12:59:31 +01:00
parent 998775e974
commit 899cdff3e8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/master.py
View File

@ -412,11 +412,11 @@ class Publisher(multiprocessing.Process):
pub_sock = context.socket(zmq.PUB) pub_sock = context.socket(zmq.PUB)
# if 2.1 >= zmq < 3.0, we only have one HWM setting # if 2.1 >= zmq < 3.0, we only have one HWM setting
try: 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 # in zmq >= 3.0, there are separate send and receive HWM settings
except AttributeError: except AttributeError:
pub_sock.setsockopt(zmq.SNDHWM, 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', 100)) pub_sock.setsockopt(zmq.RCVHWM, self.opts.get('pub_hwm', 1000))
if self.opts['ipv6'] is True and hasattr(zmq, 'IPV4ONLY'): if self.opts['ipv6'] is True and hasattr(zmq, 'IPV4ONLY'):
# IPv6 sockets work for both IPv6 and IPv4 addresses # IPv6 sockets work for both IPv6 and IPv4 addresses
pub_sock.setsockopt(zmq.IPV4ONLY, 0) pub_sock.setsockopt(zmq.IPV4ONLY, 0)