From 1b9b952b503424c1c912c8db70bd5c9634d11b12a33999b0e0194a1b50fd9f1d Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Tue, 17 Feb 2015 10:25:19 +0000 Subject: [PATCH] Accepting request 286328 from Cloud:OpenStack:Master - replace set_socket_TCP_KEEPALIVE_and_TCP_USER_TIMEOUT.patch with tune-keepalive-intervals.diff (bnc#902207) OBS-URL: https://build.opensuse.org/request/show/286328 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-amqp?expand=0&rev=30 --- python-amqp.changes | 6 ++++++ python-amqp.spec | 4 +++- tune-keepalive-intervals.diff | 15 +++++++++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 tune-keepalive-intervals.diff diff --git a/python-amqp.changes b/python-amqp.changes index 68b3d12..b3c1a29 100644 --- a/python-amqp.changes +++ b/python-amqp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 29 16:15:42 UTC 2015 - dmueller@suse.com + +- replace set_socket_TCP_KEEPALIVE_and_TCP_USER_TIMEOUT.patch + with tune-keepalive-intervals.diff (bnc#902207) + ------------------------------------------------------------------- Mon Sep 15 07:50:41 UTC 2014 - tbechtold@suse.com diff --git a/python-amqp.spec b/python-amqp.spec index 77c5524..79a2291 100644 --- a/python-amqp.spec +++ b/python-amqp.spec @@ -1,7 +1,7 @@ # # spec file for package python-amqp # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,6 +26,7 @@ Url: http://github.com/celery/py-amqp Source: https://pypi.python.org/packages/source/a/amqp/amqp-%{version}.tar.gz # PATCH-FIX-OPENSUSE speilicke@suse.com -- Avoid excessive doc dependencies Patch0: amqp-drop-sphinxcontrib-issuetracker-dependency.patch +Patch1: tune-keepalive-intervals.diff BuildRequires: python-devel BuildRequires: python-setuptools # Documentation requirements: @@ -49,6 +50,7 @@ This library should be API compatible with librabbitmq. %prep %setup -q -n amqp-%{version} %patch0 -p1 +%patch1 -p0 %build python setup.py build diff --git a/tune-keepalive-intervals.diff b/tune-keepalive-intervals.diff new file mode 100644 index 0000000..809bc1f --- /dev/null +++ b/tune-keepalive-intervals.diff @@ -0,0 +1,15 @@ +--- amqp/transport.py ++++ amqp/transport.py +@@ -98,6 +98,12 @@ + self.sock.settimeout(None) + self.sock.setsockopt(SOL_TCP, socket.TCP_NODELAY, 1) + self.sock.setsockopt(socket.SOL_SOCKET, socket.SO_KEEPALIVE, 1) ++ # If connection is idle for more than KEEPIDLE seconds ++ # Start sending a probe every KEEPINTVL seconds ++ # for KEEPCNT times. If none respond, about the connection ++ self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPIDLE, 60) ++ self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPINTVL, 10) ++ self.sock.setsockopt(socket.SOL_TCP, socket.TCP_KEEPCNT, 9) + + self._setup_transport() +