Changing code to try port 5672 first and then on exception try port 80.

godotgildor · Mar 23, 2014 · 752a32e · 752a32e
1 parent d41e313
commit 752a32e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 12 deletions.
diff --git a/installer/install_suns.py b/installer/install_suns.py
@@ -134,12 +134,16 @@ def run(self):
         
         credentials = PlainCredentials('suns-client', 'suns-client')
         try:
-            # Connection initialization
-            connection = BlockingConnection(
-                ConnectionParameters(
-                    host = self.suns_server_address,
-                    credentials = credentials,
-                    virtual_host = 'suns-vhost'))
+            def connect(port):
+                return BlockingConnection(
+                    ConnectionParameters(host=self.suns_server_address,
+                                         port=port,
+                                         credentials=credentials,
+                                         virtual_host='suns-vhost'))
+            try:
+                connect(5672)
+            except:
+                connect(80)
             try:
                 # Channel Initialization
                 self.channel = connection.channel()

diff --git a/src/__init__.py b/src/__init__.py
@@ -154,12 +154,16 @@ def run(self):
 
         credentials = PlainCredentials('suns-client', 'suns-client')
         try:
-            # Connection initialization
-            connection = BlockingConnection(
-                ConnectionParameters(
-                    host = self.suns_server_address,
-                    credentials = credentials,
-                    virtual_host = 'suns-vhost'))
+            def connect(port):
+                return BlockingConnection(
+                    ConnectionParameters(host=self.suns_server_address,
+                                         port=port,
+                                         credentials=credentials,
+                                         virtual_host='suns-vhost'))
+            try:
+                connect(5672)
+            except:
+                connect(80)
             try:
                 # Channel Initialization
                 self.channel = connection.channel()