summary refs log tree commit diff
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2017-01-10 16:31:06 +0000
committerErik Johnston <erik@matrix.org>2017-01-10 16:31:06 +0000
commit3c9acdef4d3fa3aafc67a92924efff1dea3c5683 (patch)
tree6ecd3a4e50d0e062eb89188d996815b1cfce41fd
parentMerge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes (diff)
parentRemove spurious for..else.. (diff)
downloadsynapse-3c9acdef4d3fa3aafc67a92924efff1dea3c5683.tar.xz
Merge branch 'develop' of github.com:matrix-org/synapse into matrix-org-hotfixes
-rw-r--r--synapse/app/pusher.py11
1 files changed, 0 insertions, 11 deletions
diff --git a/synapse/app/pusher.py b/synapse/app/pusher.py

index a3df375c81..57e097fa11 100644 --- a/synapse/app/pusher.py +++ b/synapse/app/pusher.py
@@ -146,17 +146,6 @@ class PusherServer(HomeServer): ), interface=address ) - else: - reactor.listenTCP( - port, - SynapseSite( - "synapse.access.http.%s" % (site_tag,), - site_tag, - listener_config, - root_resource, - ), - interface=bind_address - ) logger.info("Synapse pusher now listening on port %d", port)