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

Merge pull request #7485 from s0undt3ch/hotfix/zmq-version-info

Browse Source 
Keep ZMQ version checking simple.
This commit is contained in:
Thomas S Hatch 2013-09-27 08:09:18 -07:00
commit f7628be386
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
salt/master.py
View File

@ -167,10 +167,8 @@ class Master(SMaster):
'''
Create a salt master server instance
'''
# Warn if ZMQ < 3
if (int(zmq.zmq_version()[0]) < 3 or
(int(zmq.zmq_version()[0]) == 3 and
int(zmq.zmq_version()[2]) < 2)):
# Warn if ZMQ < 3.2
if zmq.zmq_version_info() < (3, 2):
log.warning('You have a version of ZMQ less than ZMQ 3.2! There '
'are known connection keep-alive issues with ZMQ < '
'3.2 which may result in loss of contact with '

4
salt/minion.py
View File

@ -458,9 +458,7 @@ class Minion(object):
Pass in the options dict
'''
# Warn if ZMQ < 3.2
if HAS_ZMQ and (int(zmq.zmq_version()[0]) < 3 or
(int(zmq.zmq_version()[0]) == 3 and
int(zmq.zmq_version()[2]) < 2)):
if HAS_ZMQ and zmq.zmq_version_info() < (3, 2):
log.warning('You have a version of ZMQ less than ZMQ 3.2! There '
'are known connection keep-alive issues with ZMQ < '
'3.2 which may result in loss of contact with '