Set default KEEPIDLE/KEEPCNT/KEEPINTVL and TCP_USER_TIMEOUT

celery · Dec 14, 2016 · b14962c · b14962c
1 parent 479a119
commit b14962c
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/amqp/transport.py b/amqp/transport.py
@@ -61,9 +61,27 @@ class SSLError(Exception):  # noqa
 TCP_OPTS = {
     getattr(socket, opt) for opt in KNOWN_TCP_OPTS if hasattr(socket, opt)
 }
+DEFAULT_SOCKET_SETTINGS = {
+    socket.TCP_NODELAY: 1,
+}
+
 if HAS_TCP_USER_TIMEOUT:
     KNOWN_TCP_OPTS += ('TCP_USER_TIMEOUT',)
     TCP_OPTS.add(TCP_USER_TIMEOUT)
+    DEFAULT_SOCKET_SETTINGS[TCP_USER_TIMEOUT] = 1000
+
+
+try:
+    from socket import TCP_KEEPIDLE, TCP_KEEPINTVL, TCP_KEEPCNT # noqa
+except ImportError:
+    pass
+else:
+    DEFAULT_SOCKET_SETTINGS.update({
+        TCP_KEEPIDLE: 60,
+        TCP_KEEPINTVL: 10,
+        TCP_KEEPCNT: 9,
+    })
+
 
 
 def to_host_port(host, default=AMQP_PORT):
@@ -178,22 +196,10 @@ def _get_tcp_socket_defaults(self, sock):
         }
 
     def _set_socket_options(self, socket_settings):
-        user_timeout = 0
-        if self.connect_timeout is not None:
-            user_timeout = int(math.ceil(self.connect_timeout * 1000.0))
-
-        if not socket_settings:
-            self.sock.setsockopt(SOL_TCP, socket.TCP_NODELAY, 1)
-            if HAS_TCP_USER_TIMEOUT:
-                self.sock.setsockopt(SOL_TCP, TCP_USER_TIMEOUT, user_timeout)
-            return
-
         tcp_opts = self._get_tcp_socket_defaults(self.sock)
-        tcp_opts.setdefault(socket.TCP_NODELAY, 1)
-        if HAS_TCP_USER_TIMEOUT:
-            tcp_opts.setdefault(TCP_USER_TIMEOUT, user_timeout)
-        tcp_opts.update(socket_settings)
-
+        final_socket_settings = dict(DEFAULT_SOCKET_SETTINGS)
+        final_socket_settings.update(socket_settings)
+        tcp_opts.update(final_socket_settings)
         for opt, val in items(tcp_opts):
             self.sock.setsockopt(SOL_TCP, opt, val)