diff options
| author | Matthew Hodgson <matthew@matrix.org> | 2018-03-13 22:11:58 +0000 |
|---|---|---|
| committer | Matthew Hodgson <matthew@matrix.org> | 2018-03-13 22:11:58 +0000 |
| commit | 12350e3f9aeac73f80d1c5bb35ef9e5d0887dec0 (patch) | |
| tree | 1db11e8ee3cd835de2c8d33aaf9534573d0ac357 /synapse/app | |
| parent | ensure we always include the members for a given timeline block (diff) | |
| parent | typoe (diff) | |
| download | synapse-12350e3f9aeac73f80d1c5bb35ef9e5d0887dec0.tar.xz | |
merge proper fix to bug 2969
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/client_reader.py | 1 | ||||
| -rw-r--r-- | synapse/app/event_creator.py | 1 | ||||
| -rw-r--r-- | synapse/app/federation_reader.py | 1 | ||||
| -rw-r--r-- | synapse/app/frontend_proxy.py | 1 | ||||
| -rwxr-xr-x | synapse/app/homeserver.py | 2 | ||||
| -rw-r--r-- | synapse/app/media_repository.py | 1 |
6 files changed, 1 insertions, 6 deletions
diff --git a/synapse/app/client_reader.py b/synapse/app/client_reader.py index 3b3352798d..0a8ce9bc66 100644 --- a/synapse/app/client_reader.py +++ b/synapse/app/client_reader.py @@ -156,7 +156,6 @@ def start(config_options): ) ss.setup() - ss.get_handlers() ss.start_listening(config.worker_listeners) def start(): diff --git a/synapse/app/event_creator.py b/synapse/app/event_creator.py index fc0b9e8c04..eb593c5278 100644 --- a/synapse/app/event_creator.py +++ b/synapse/app/event_creator.py @@ -161,7 +161,6 @@ def start(config_options): ) ss.setup() - ss.get_handlers() ss.start_listening(config.worker_listeners) def start(): diff --git a/synapse/app/federation_reader.py b/synapse/app/federation_reader.py index 4de43c41f0..20d157911b 100644 --- a/synapse/app/federation_reader.py +++ b/synapse/app/federation_reader.py @@ -144,7 +144,6 @@ def start(config_options): ) ss.setup() - ss.get_handlers() ss.start_listening(config.worker_listeners) def start(): diff --git a/synapse/app/frontend_proxy.py b/synapse/app/frontend_proxy.py index e32ee8fe93..816c080d18 100644 --- a/synapse/app/frontend_proxy.py +++ b/synapse/app/frontend_proxy.py @@ -211,7 +211,6 @@ def start(config_options): ) ss.setup() - ss.get_handlers() ss.start_listening(config.worker_listeners) def start(): diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index e375f2bbcf..e477c7ced6 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -348,7 +348,7 @@ def setup(config_options): hs.get_state_handler().start_caching() hs.get_datastore().start_profiling() hs.get_datastore().start_doing_background_updates() - hs.get_replication_layer().start_get_pdu_cache() + hs.get_federation_client().start_get_pdu_cache() register_memory_metrics(hs) diff --git a/synapse/app/media_repository.py b/synapse/app/media_repository.py index 1ed1ca8772..84c5791b3b 100644 --- a/synapse/app/media_repository.py +++ b/synapse/app/media_repository.py @@ -158,7 +158,6 @@ def start(config_options): ) ss.setup() - ss.get_handlers() ss.start_listening(config.worker_listeners) def start(): |