summary refs log tree commit diff
path: root/synapse/app/pusher.py
diff options
context:
space:
mode:
authorErik Johnston <erikj@jki.re>2017-01-13 13:02:59 +0000
committerGitHub <noreply@github.com>2017-01-13 13:02:59 +0000
commit641ccdbb14be249c96f11c9d461c1429a6fc86a9 (patch)
tree361c50b0a3319280b8a0bde50dc00f264db36e10 /synapse/app/pusher.py
parentREADME.rst: fix formatting (diff)
parentPop bind_address (diff)
downloadsynapse-641ccdbb14be249c96f11c9d461c1429a6fc86a9.tar.xz
Merge pull request #1795 from matrix-org/erikj/port_defaults
Restore default bind address
Diffstat (limited to 'synapse/app/pusher.py')
-rw-r--r--synapse/app/pusher.py12
1 files changed, 2 insertions, 10 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py
index 57e097fa11..073f2c2489 100644
--- a/synapse/app/pusher.py
+++ b/synapse/app/pusher.py
@@ -121,8 +121,7 @@ class PusherServer(HomeServer):
 
     def _listen_http(self, listener_config):
         port = listener_config["port"]
-        bind_address = listener_config.get("bind_address", None)
-        bind_addresses = listener_config.get("bind_addresses", [])
+        bind_addresses = listener_config["bind_addresses"]
         site_tag = listener_config.get("tag", port)
         resources = {}
         for res in listener_config["resources"]:
@@ -132,9 +131,6 @@ class PusherServer(HomeServer):
 
         root_resource = create_resource_tree(resources, Resource())
 
-        if bind_address is not None:
-            bind_addresses.append(bind_address)
-
         for address in bind_addresses:
             reactor.listenTCP(
                 port,
@@ -154,11 +150,7 @@ class PusherServer(HomeServer):
             if listener["type"] == "http":
                 self._listen_http(listener)
             elif listener["type"] == "manhole":
-                bind_address = listener.get("bind_address", None)
-                bind_addresses = listener.get("bind_addresses", [])
-
-                if bind_address is not None:
-                    bind_addresses.append(bind_address)
+                bind_addresses = listener["bind_addresses"]
 
                 for address in bind_addresses:
                     reactor.listenTCP(