From 7f147d623b981644d22cd4db7db0e7baf33b0e2e Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Fri, 24 Aug 2018 11:31:31 +0100 Subject: Fix bug where we broke sync when using limit_usage_by_mau We assumed that we always had service notices configured, but that is not always true --- synapse/server_notices/resource_limits_server_notices.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'synapse') diff --git a/synapse/server_notices/resource_limits_server_notices.py b/synapse/server_notices/resource_limits_server_notices.py index 96eb97771f..98495ddbf9 100644 --- a/synapse/server_notices/resource_limits_server_notices.py +++ b/synapse/server_notices/resource_limits_server_notices.py @@ -66,6 +66,10 @@ class ResourceLimitsServerNotices(object): if self._config.limit_usage_by_mau is False: return + if not self._server_notices_manager.is_enabled(): + # Don't try and send server notices unles they've been enabled + return + timestamp = yield self._store.user_last_seen_monthly_active(user_id) if timestamp is None: # This user will be blocked from receiving the notice anyway. -- cgit 1.4.1