openstack/oslo.messaging
Code Issues Proposed changes

Merge "Fix oslo.messaging for Mac OS X"

Browse Source
This commit is contained in:
Jenkins 2016-04-06 20:59:21 +00:00 committed by Gerrit Code Review
commit 7f1aef5697
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oslo_messaging/_drivers/impl_rabbit.py
View File

@ -868,7 +868,8 @@ class Connection(object):
LOG.debug('Failed to get socket attribute: %s' % str(e))
else:
sock.settimeout(timeout)
if sys.platform != 'win32':
# TCP_USER_TIMEOUT is not defined on Windows and Mac OS X
if sys.platform != 'win32' and sys.platform != 'darwin':
sock.setsockopt(socket.IPPROTO_TCP,
TCP_USER_TIMEOUT,
timeout * 1000 if timeout is not None else 0)