diff options
| author | Erik Johnston <erik@matrix.org> | 2020-05-13 17:15:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-13 17:15:40 +0100 |
| commit | 1124111a12c3ab35f8b68d9031695aec8b2c7c50 (patch) | |
| tree | 1ab8125083d6d72ecc747e4f1d2c2d4cae8993cc /synapse/handlers/message.py | |
| parent | Fix copypasted comment (#7477) (diff) | |
| download | synapse-1124111a12c3ab35f8b68d9031695aec8b2c7c50.tar.xz | |
Allow censoring of events to happen on workers. (#7492)
This is safe as we can now write to cache invalidation stream on workers, and is required for when we move event persistence off master.
Diffstat (limited to 'synapse/handlers/message.py')
| -rw-r--r-- | synapse/handlers/message.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/handlers/message.py b/synapse/handlers/message.py index a622a600b4..0242521cc6 100644 --- a/synapse/handlers/message.py +++ b/synapse/handlers/message.py @@ -72,7 +72,6 @@ class MessageHandler(object): self.state_store = self.storage.state self._event_serializer = hs.get_event_client_serializer() self._ephemeral_events_enabled = hs.config.enable_ephemeral_messages - self._is_worker_app = bool(hs.config.worker_app) # The scheduled call to self._expire_event. None if no call is currently # scheduled. @@ -260,7 +259,6 @@ class MessageHandler(object): Args: event (EventBase): The event to schedule the expiry of. """ - assert not self._is_worker_app expiry_ts = event.content.get(EventContentFields.SELF_DESTRUCT_AFTER) if not isinstance(expiry_ts, int) or event.is_state(): |