tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Don't create empty AS txns when the AS is down (#12869)

Browse source
This commit is contained in:
Nick Mills-Barrett 2022-05-25 10:46:05 +01:00 committed by GitHub
parent 2e5f88b5e6
commit 33e2916858
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/12869.misc Normal file
View file

@ -0,0 +1 @@
Don't generate empty AS transactions when the AS is flagged as down. Contributed by Nick @ Beeper.

6
synapse/appservice/scheduler.py
View file

@ -384,6 +384,11 @@ class _TransactionController:
device_list_summary: The device list summary to include in the transaction. device_list_summary: The device list summary to include in the transaction.
""" """
try: try:
service_is_up = await self._is_service_up(service)
# Don't create empty txns when in recovery mode (ephemeral events are dropped)
if not service_is_up and not events:
return
txn = await self.store.create_appservice_txn( txn = await self.store.create_appservice_txn(
service=service, service=service,
events=events, events=events,
@ -393,7 +398,6 @@ class _TransactionController:
unused_fallback_keys=unused_fallback_keys or {}, unused_fallback_keys=unused_fallback_keys or {},
device_list_summary=device_list_summary or DeviceListUpdates(), device_list_summary=device_list_summary or DeviceListUpdates(),
) )
service_is_up = await self._is_service_up(service)
if service_is_up: if service_is_up:
sent = await txn.send(self.as_api) sent = await txn.send(self.as_api)
if sent: if sent: