pyamqp/librabbitmq now uses 5671 as default port if SSL is enabled. C…

…loses #459
celery · Apr 17, 2015 · 53f1066 · 53f1066
1 parent d720d33
commit 53f1066
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/kombu/transport/librabbitmq.py b/kombu/transport/librabbitmq.py
@@ -27,6 +27,7 @@
     so make sure you are using librabbitmq 1.5 when using rabbitmq > 3.3
 """
 DEFAULT_PORT = 5672
+DEFAULT_SSL_PORT = 5671
 
 NO_SSL_ERROR = """\
 ssl not supported by librabbitmq, please use pyamqp:// or stunnel\
@@ -71,6 +72,8 @@ class Transport(base.Transport):
     Connection = Connection
 
     default_port = DEFAULT_PORT
+    default_ssl_port = DEFAULT_SSL_PORT
+
     connection_errors = (
         base.Transport.connection_errors + (
             ConnectionError, socket.error, IOError, OSError)
@@ -86,6 +89,8 @@ class Transport(base.Transport):
     def __init__(self, client, **kwargs):
         self.client = client
         self.default_port = kwargs.get('default_port') or self.default_port
+        self.default_ssl_port = (kwargs.get('default_ssl_port') or
+                                 self.default_ssl_port)
         self.__reader = None
 
     def driver_version(self):
@@ -161,6 +166,11 @@ def qos_semantics_matches_spec(self, connection):
 
     @property
     def default_connection_params(self):
-        return {'userid': 'guest', 'password': 'guest',
-                'port': self.default_port,
-                'hostname': 'localhost', 'login_method': 'AMQPLAIN'}
+        return {
+            'userid': 'guest',
+            'password': 'guest',
+            'port': (self.default_ssl_port if self.client.ssl
+                     else self.default_port),
+            'hostname': 'localhost',
+            'login_method': 'AMQPLAIN',
+        }
diff --git a/kombu/transport/pyamqp.py b/kombu/transport/pyamqp.py
@@ -16,6 +16,7 @@
 from . import base
 
 DEFAULT_PORT = 5672
+DEFAULT_SSL_PORT = 5671
 
 
 class Message(base.Message):
@@ -63,6 +64,7 @@ class Transport(base.Transport):
     Connection = Connection
 
     default_port = DEFAULT_PORT
+    default_ssl_port = DEFAULT_SSL_PORT
 
     # it's very annoying that pyamqp sometimes raises AttributeError
     # if the connection is lost, but nothing we can do about that here.
@@ -77,9 +79,11 @@ class Transport(base.Transport):
     supports_heartbeats = True
     supports_ev = True
 
-    def __init__(self, client, default_port=None, **kwargs):
+    def __init__(self, client,
+                 default_port=None, default_ssl_port=None, **kwargs):
         self.client = client
         self.default_port = default_port or self.default_port
+        self.default_ssl_port = default_ssl_port or self.default_ssl_port
 
     def driver_version(self):
         return amqp.__version__
@@ -138,9 +142,14 @@ def qos_semantics_matches_spec(self, connection):
 
     @property
     def default_connection_params(self):
-        return {'userid': 'guest', 'password': 'guest',
-                'port': self.default_port,
-                'hostname': 'localhost', 'login_method': 'AMQPLAIN'}
+        return {
+            'userid': 'guest',
+            'password': 'guest',
+            'port': (self.default_ssl_port if self.client.ssl
+                     else self.default_port),
+            'hostname': 'localhost',
+            'login_method': 'AMQPLAIN',
+        }
 
     def get_manager(self, *args, **kwargs):
         return get_manager(self.client, *args, **kwargs)