Merge pull request #5389 from matrix-org/erikj/renew_attestations_on_master

Only start background group attestation renewals on master
This commit is contained in:
Erik Johnston 2019-06-17 13:54:29 +01:00 committed by GitHub
commit 414d2ca3a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

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

@ -0,0 +1 @@
Fix exceptions in federation reader worker caused by attempting to renew attestations, which should only happen on master worker.

View File

@ -132,6 +132,7 @@ class GroupAttestionRenewer(object):
self.is_mine_id = hs.is_mine_id self.is_mine_id = hs.is_mine_id
self.attestations = hs.get_groups_attestation_signing() self.attestations = hs.get_groups_attestation_signing()
if not hs.config.worker_app:
self._renew_attestations_loop = self.clock.looping_call( self._renew_attestations_loop = self.clock.looping_call(
self._start_renew_attestations, 30 * 60 * 1000, self._start_renew_attestations, 30 * 60 * 1000,
) )