diff options
| author | David Robertson <davidr@element.io> | 2021-11-17 14:19:27 +0000 |
|---|---|---|
| committer | David Robertson <davidr@element.io> | 2021-11-17 14:19:27 +0000 |
| commit | 077b74929f8f412395d1156e1b97eb16701059fa (patch) | |
| tree | 25ecb8e93ec3ba275596bfb31efa45018645d47b /synapse/server.py | |
| parent | Correct target of link to the modules page from the Password Auth Providers p... (diff) | |
| parent | 1.47.0 (diff) | |
| download | synapse-077b74929f8f412395d1156e1b97eb16701059fa.tar.xz | |
Merge remote-tracking branch 'origin/release-v1.47'
Diffstat (limited to 'synapse/server.py')
| -rw-r--r-- | synapse/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/server.py b/synapse/server.py index 0fbf36ba99..013a7bacaa 100644 --- a/synapse/server.py +++ b/synapse/server.py @@ -463,7 +463,7 @@ class HomeServer(metaclass=abc.ABCMeta): @cache_in_self def get_typing_writer_handler(self) -> TypingWriterHandler: - if self.config.worker.writers.typing == self.get_instance_name(): + if self.get_instance_name() in self.config.worker.writers.typing: return TypingWriterHandler(self) else: raise Exception("Workers cannot write typing") @@ -474,7 +474,7 @@ class HomeServer(metaclass=abc.ABCMeta): @cache_in_self def get_typing_handler(self) -> FollowerTypingHandler: - if self.config.worker.writers.typing == self.get_instance_name(): + if self.get_instance_name() in self.config.worker.writers.typing: # Use get_typing_writer_handler to ensure that we use the same # cached version. return self.get_typing_writer_handler() |