From 7f147d623b981644d22cd4db7db0e7baf33b0e2e Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 24 Aug 2018 11:31:31 +0100
Subject: [PATCH 1/2] 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(+)
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.
From 9b1bc593c519219b6006ece5f06756ba764a9eeb Mon Sep 17 00:00:00 2001
From: Erik Johnston <erik@matrix.org>
Date: Fri, 24 Aug 2018 11:36:39 +0100
Subject: [PATCH 2/2] Newsfile
---
changelog.d/3753.bugfix | 1 +
1 file changed, 1 insertion(+)
create mode 100644 changelog.d/3753.bugfix
diff --git a/changelog.d/3753.bugfix b/changelog.d/3753.bugfix
new file mode 100644
index 0000000000..b4301267df
--- /dev/null
+++ b/changelog.d/3753.bugfix
@@ -0,0 +1 @@
+Fix bug where we broke sync when using limit_usage_by_mau but hadn't configured server notices