From 8afa73b43ff39f4cb4156ca27b722a228c4543b5 Mon Sep 17 00:00:00 2001 From: Dmitry Mescheryakov Date: Wed, 6 Apr 2016 19:23:22 +0300 Subject: [PATCH] Fix oslo.messaging for Mac OS X TCP_USER_TIMEOUT is not defined on Mac OS X, so we should not set it on that platform. Change-Id: If745d4981dea24e4267c95473059ff71176ae7d9 Closes-Bug: #1566862 --- oslo_messaging/_drivers/impl_rabbit.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/oslo_messaging/_drivers/impl_rabbit.py b/oslo_messaging/_drivers/impl_rabbit.py index 5939d0682..718b978a0 100644 --- a/oslo_messaging/_drivers/impl_rabbit.py +++ b/oslo_messaging/_drivers/impl_rabbit.py @@ -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)