diff options
| author | Amber Brown <hawkowl@atleastfornow.net> | 2018-08-18 01:08:45 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-18 01:08:45 +1000 |
| commit | c334ca67bb89039b3a00b7c9a1ce610e99859653 (patch) | |
| tree | bc70fc575b225a0cd25694bbd371f3c78bea3b43 /synapse/app/_base.py | |
| parent | Remove v1/register's broken shared secret functionality (#3703) (diff) | |
| download | synapse-c334ca67bb89039b3a00b7c9a1ce610e99859653.tar.xz | |
Integrate presence from hotfixes (#3694)
Diffstat (limited to 'synapse/app/_base.py')
| -rw-r--r-- | synapse/app/_base.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py index 391bd14c5c..7c866e246a 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py @@ -140,7 +140,7 @@ def listen_metrics(bind_addresses, port): logger.info("Metrics now reporting on %s:%d", host, port) -def listen_tcp(bind_addresses, port, factory, backlog=50): +def listen_tcp(bind_addresses, port, factory, reactor=reactor, backlog=50): """ Create a TCP socket for a port and several addresses """ @@ -156,7 +156,9 @@ def listen_tcp(bind_addresses, port, factory, backlog=50): check_bind_error(e, address, bind_addresses) -def listen_ssl(bind_addresses, port, factory, context_factory, backlog=50): +def listen_ssl( + bind_addresses, port, factory, context_factory, reactor=reactor, backlog=50 +): """ Create an SSL socket for a port and several addresses """ |