diff options
| author | Mathieu Velten <mathieuv@matrix.org> | 2023-08-16 16:19:54 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-16 16:19:54 +0200 |
| commit | 8c3bcea2da4939e21a99f72d6c3995186bc4b80d (patch) | |
| tree | eee47996c192118ab4f0b3af9b50de3d095fb65b /synapse/federation/federation_server.py | |
| parent | Add link explaining ELK stack to structured_logging.md (#16091) (diff) | |
| download | synapse-8c3bcea2da4939e21a99f72d6c3995186bc4b80d.tar.xz | |
Rename pagination&purge locks and add comments explaining them (#16112)
Diffstat (limited to 'synapse/federation/federation_server.py')
| -rw-r--r-- | synapse/federation/federation_server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/federation/federation_server.py b/synapse/federation/federation_server.py index a90d99c4d6..f9915e5a3f 100644 --- a/synapse/federation/federation_server.py +++ b/synapse/federation/federation_server.py @@ -63,7 +63,7 @@ from synapse.federation.federation_base import ( ) from synapse.federation.persistence import TransactionActions from synapse.federation.units import Edu, Transaction -from synapse.handlers.worker_lock import DELETE_ROOM_LOCK_NAME +from synapse.handlers.worker_lock import NEW_EVENT_DURING_PURGE_LOCK_NAME from synapse.http.servlet import assert_params_in_dict from synapse.logging.context import ( make_deferred_yieldable, @@ -1245,7 +1245,7 @@ class FederationServer(FederationBase): # while holding the `_INBOUND_EVENT_HANDLING_LOCK_NAME` # lock. async with self._worker_lock_handler.acquire_read_write_lock( - DELETE_ROOM_LOCK_NAME, room_id, write=False + NEW_EVENT_DURING_PURGE_LOCK_NAME, room_id, write=False ): await self._federation_event_handler.on_receive_pdu( origin, event |