kaslo/synapse
1
0
Fork 0
Code Wiki Activity

Merge commit '53834bb9c' into anoa/dinsic_release_1_21_x

Browse Source 
* commit '53834bb9c':
  Run `remove_push_actions_from_staging` in foreground (#8081)
This commit is contained in:
Andrew Morgan
2020-10-19 18:24:46 +01:00
parent 1b99b00740 53834bb9c4
commit 48a182c010
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/8081.bugfix Normal file
View File

@@ -0,0 +1 @@
Fix `Re-starting finished log context PUT-nnnn` warning when event persistence failed.

4
synapse/handlers/message.py
View File

@@ -894,9 +894,7 @@ class EventCreationHandler(object):
except Exception:
# Ensure that we actually remove the entries in the push actions
# staging area, if we calculated them.
run_in_background(
self.store.remove_push_actions_from_staging, event.event_id
)
await self.store.remove_push_actions_from_staging(event.event_id)
raise
async def _validate_canonical_alias(