Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-08-07 08:32:11 -04:00
Code Issues Projects Releases Packages Wiki Activity

support server notice state events for resource limits

Browse source
This commit is contained in:
Neil Johnson 2018-08-14 11:20:41 +01:00
parent 63417c31e9
commit 9b75c78b4d
4 changed files with 22 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

21
synapse/server_notices/resource_limits_server_notices.py
View file

@ -17,6 +17,7 @@ import logging
from twisted.internet import defer
from synapse.api.errors import AuthError, SynapseError
from synapse.api.constants import EventTypes
logger = logging.getLogger(__name__)
@ -61,22 +62,32 @@ class ResourceLimitsServerNotices(object):
# In practice, not sure we can ever get here
return
try:
# Normally should always pass in user_id if you have it, but in
# this case are checking what would happen to other users if they
# were to arrive.
yield self.auth.check_auth_blocking()
self._resouce_limited = False
# Need to start removing notices
if user_id in self._notified_of_blocking:
# Send message to remove warning - needs updating
content = "remove warning"
content = {
'body': '',
'admin_email': '',
}
self._send_server_notice(user_id, content)
self._notified_of_blocking.remove(user_id)
except AuthError:
except AuthError as e:
# Need to start notifying of blocking
self._resouce_limited = True
if user_id not in self._notified_of_blocking:
# Send message to add warning - needs updating
content = "add warning"
# TODO use admin email contained in error once PR lands
content = {
'body': e.msg,
'admin_email': 'stunt@adminemail.com',
'msgtype': 'm.text'
}
self._send_server_notice(user_id, content)
self._notified_of_blocking.add(user_id)
@ -93,7 +104,7 @@ class ResourceLimitsServerNotices(object):
"""
try:
yield self._server_notices_manager.send_notice(
user_id, content,
user_id, content, EventTypes.ServerNoticeLimitReached
)
except SynapseError as e:
logger.error("Error sending server notice about resource limits: %s", e)