diff options
| author | Erik Johnston <erik@matrix.org> | 2020-07-16 15:12:54 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 15:12:54 +0100 |
| commit | f2e38ca86711a8f80cf45d3182e426ed8967fc81 (patch) | |
| tree | 5a46223ed7b3e50f018d96a09776b7e442619377 /synapse/replication/tcp/streams | |
| parent | Add ability to run multiple pusher instances (#7855) (diff) | |
| download | synapse-f2e38ca86711a8f80cf45d3182e426ed8967fc81.tar.xz | |
Allow moving typing off master (#7869)
Diffstat (limited to 'synapse/replication/tcp/streams')
| -rw-r--r-- | synapse/replication/tcp/streams/_base.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/synapse/replication/tcp/streams/_base.py b/synapse/replication/tcp/streams/_base.py index 9076bbe9f1..7a42de3f7d 100644 --- a/synapse/replication/tcp/streams/_base.py +++ b/synapse/replication/tcp/streams/_base.py @@ -294,11 +294,12 @@ class TypingStream(Stream): def __init__(self, hs): typing_handler = hs.get_typing_handler() - if hs.config.worker_app is None: - # on the master, query the typing handler + writer_instance = hs.config.worker.writers.typing + if writer_instance == hs.get_instance_name(): + # On the writer, query the typing handler update_function = typing_handler.get_all_typing_updates else: - # Query master process + # Query the typing writer process update_function = make_http_update_function(hs, self.NAME) super().__init__( |