Make connections configurable

Author: Marco Paolini

pushpull/amqp/gateway.py

@@ -12,8 +12,7 @@ class Exchanger:
     ROLE_WS = 1
     ROLE_APP = 2
 
-    def __init__(self, name, role, client_id=0, **connection_params):
-        self._conn_params = connection_params
+    def __init__(self, name, role, client_id=0):
         if role not in [self.ROLE_WS, self.ROLE_APP]:
             raise ValueError('bad role {}'.format(role))
         self.role = role
@@ -22,7 +21,9 @@ def __init__(self, name, role, client_id=0, **connection_params):
 
     async def __aenter__(self):
         logger.debug('connecting with role {}'.format(self.role))
-        self._conn = await asynqp.connect(**self._conn_params)
+        from .. import config
+        params = config.get_amqp_conn_params()
+        self._conn = await asynqp.connect(**params)
         self._chan = await self._conn.open_channel()
         app_routing_key = '{}.app'.format(self.name)
         app_exchange = await self._chan.declare_exchange(app_routing_key, 'fanout')

pushpull/cli/server.py

@@ -6,8 +6,10 @@
 
 @click.command()
 def serve():
+    from .. import config
     logging.basicConfig(level=logging.DEBUG)
-    aiohttp.web.main(['-H', 'localhost', '-P', '8080', 'pushpull.websocket.server:serve'])
+    host, port = config.get_host_port()
+    aiohttp.web.main(['-H', host, '-P', port, 'pushpull.websocket.server:serve'])
 
 
 if __name__ == '__main__':

pushpull/config.py

@@ -0,0 +1,68 @@
+import urllib.parse
+import os
+
+try:
+    from django.conf import settings
+except ImportError:
+    WEBSOCKET_URL = os.environ.get('PUSHPULL_WEBSOCKET_URL', '')
+    BROKER_URL = os.environ.get('PUSHPULL_BROKER_URL', '')
+else:
+    WEBSOCKET_URL = settings.PUSHPULL_WEBSOCKET_URL
+    BROKER_URL = settings.PUSHPULL_BROKER_URL
+
+
+def get_host_port():
+    url = WEBSOCKET_URL or 'http://localhost:8080'
+    url_chunks = urllib.parse.urlparse(url)
+    host_port = url_chunks.netloc
+    if ':' in host_port:
+        host, port = host_port.split(':')
+    else:
+        host = host_port
+        port = '8080'
+    return host, port
+
+
+def get_url_path():
+    path = '/pushpull'
+    if WEBSOCKET_URL:
+        url_chunks = urllib.parse.urlparse(WEBSOCKET_URL)
+        path = url_chunks.path
+    return path
+
+
+def get_amqp_conn_params():
+    url = BROKER_URL or 'amqp://guest:guest@localhost:5672/'
+    url_chunks = urllib.parse.urlparse(url)
+    if '@' not in url_chunks.netloc:
+        host_port = url_chunks.netloc
+        username, password = None, None
+    else:
+        auth, host_port = url_chunks.netloc.split('@')
+        if ':' in auth:
+            username, password = auth.split(':')
+        else:
+            username, password = None, None
+    if not username:
+        username = 'guest'
+    if not password:
+        password = 'guest'
+    if ':' in host_port:
+        host, port = host_port.split(':')
+    else:
+        host = host_port
+        port = None
+    if not port:
+        port = 5672
+    else:
+        port = int(port)
+    path = url_chunks.path
+    if not path:
+        path = '/'
+    return {
+        'host': host,
+        'port': port,
+        'username': username,
+        'password': password,
+        'virtual_host': path,
+    }

pushpull/websocket/server.py

@@ -1,9 +1,10 @@
 import aiohttp.web
 
 from . import gateway
+from .. import config
 
 
 def serve(argv):
     app = aiohttp.web.Application()
-    app.router.add_route('*', '/sock', gateway.websocket_rabbitmq_gateway)
+    app.router.add_route('GET', config.get_url_path(), gateway.websocket_rabbitmq_gateway)
     return app