Merge pull request #3753 from matrix-org/erikj/fix_no_server_noticse

Fix bug where we broke sync when using limit_usage_by_mau

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

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.