summary refs log tree commit diff
path: root/synapse
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2016-06-07 10:24:50 +0100
committerErik Johnston <erik@matrix.org>2016-06-07 10:24:50 +0100
commit84379062f9ec259abc302af321d4ed8f5a958c01 (patch)
tree3ff79458bbbcdf1bb2c82ccccf3bb0b2cd29aede /synapse
parentFix AS retries (diff)
downloadsynapse-84379062f9ec259abc302af321d4ed8f5a958c01.tar.xz
Fix AS retries, but with correct ordering
Diffstat (limited to 'synapse')
-rw-r--r--synapse/storage/appservice.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py

index a281571637..d1ee533fac 100644 --- a/synapse/storage/appservice.py +++ b/synapse/storage/appservice.py
@@ -320,10 +320,10 @@ class ApplicationServiceTransactionStore(SQLBaseStore): event_ids = json.loads(entry["event_ids"]) - event_map = yield self.get_events(event_ids) + events = yield self._get_events(event_ids) defer.returnValue(AppServiceTransaction( - service=service, id=entry["txn_id"], events=event_map.values() + service=service, id=entry["txn_id"], events=events )) def _get_oldest_unsent_txn(self, txn, service):