simplifying config for listening

Signed-off-by: Jesse Jaggars <jjaggars@redhat.com>

Author: jhjaggars

receptor/config.py

@@ -110,18 +110,10 @@ def __init__(self, args=None):
         self.add_config_option(
             section='node',
             key='listen',
-            default_value='receptor://0.0.0.0:8888',
-            value_type='str',
+            default_value=['receptor://0.0.0.0:8888'],
+            value_type='list',
             hint='Set/override IP address and port to listen on. If not set here or in a config file, the default is receptor://0.0.0.0:8888.',
         )
-        self.add_config_option(
-            section='node',
-            key='websocket_listen',
-            default_value='',
-            value_type='str',
-            hint='Set IP address and port to listen on for websocket clients in the form ws[s]://addr:port. '
-                 'If not set here or in a config file then it is disabled',
-        )
         self.add_config_option(
             section='node',
             key='peers',
@@ -182,17 +174,9 @@ def __init__(self, args=None):
         self.add_config_option(
             section='controller',
             key='listen',
-            default_value='receptor://0.0.0.0:8888',
-            value_type='str',
-            hint='Set IP address and port to listen on. If not set here or in a config file, the default is receptor://0.0.0.0/0:8888.',
-        )
-        self.add_config_option(
-            section='controller',
-            key='websocket_listen',
-            default_value='',
-            value_type='str',
-            hint='Set IP address and port to listen on for websocket clients in the form ws://addr:port. '
-                 'If not set here or in a config file then it is disabled',
+            default_value=['receptor://0.0.0.0:8888'],
+            value_type='list',
+            hint='Set IP address and port to listen on. If not set here or in a config file, the default is receptor://0.0.0.0/0:8888. This option can be passed multiple times.',
         )
         self.add_config_option(
             section='controller',

receptor/controller.py

@@ -26,13 +26,11 @@ def __init__(self, config, loop=asyncio.get_event_loop(), queue=None):
             self.queue = asyncio.Queue(loop=loop)
         self.receptor.response_queue = self.queue
 
-    def enable_server(self, listen_url):
-        listener = self.connection_manager.get_listener(listen_url)
-        logger.info("Serving on %s", listen_url)
-        self.loop.create_task(listener)
-
-    def enable_websocket_server(self, listen_url):
-        self.enable_server(listen_url)
+    def enable_server(self, listen_urls):
+        for url in listen_urls:
+            listener = self.connection_manager.get_listener(url)
+            logger.info("Serving on %s", url)
+            self.loop.create_task(listener)
 
     async def add_peer(self, peer):
         logger.info("Connecting to peer {}".format(peer))

receptor/entrypoints.py

@@ -31,8 +31,6 @@ async def node_keepalive():
         start_http_server(config.node_stats_port)
     if not config.node_server_disable:
         controller.enable_server(config.node_listen)
-    if config.node_websocket_listen:
-        controller.enable_websocket_server(config.node_websocket_listen)
     for peer in config.node_peers:
         controller.loop.create_task(controller.add_peer(peer))
     if config.node_keepalive_interval > 1: