mirrors/synapse
1
0
Fork 0
mirror of https://github.com/element-hq/synapse.git synced 2024-12-22 04:34:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fix errors

Browse source
This commit is contained in:
Travis Ralston 2019-07-03 14:53:22 -06:00
parent 3c9c39df6c
commit b1f2078ef1
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
synapse/api/auth.py
View file

@ -525,7 +525,7 @@ class Auth(object):
401, 401,
"Token soft logged out", "Token soft logged out",
errcode=Codes.UNKNOWN_TOKEN, errcode=Codes.UNKNOWN_TOKEN,
softLogout=True, soft_logout=True,
) )
# we use ret.get() below because *lots* of unit tests stub out # we use ret.get() below because *lots* of unit tests stub out

9
synapse/api/errors.py
View file

@ -85,7 +85,7 @@ class SynapseError(CodeMessageException):
errcode (str): Matrix error code e.g 'M_FORBIDDEN' errcode (str): Matrix error code e.g 'M_FORBIDDEN'
""" """
def __init__(self, code, msg, errcode=Codes.UNKNOWN, softLogout=False): def __init__(self, code, msg, errcode=Codes.UNKNOWN, soft_logout=False):
"""Constructs a synapse error. """Constructs a synapse error.
Args: Args:
@ -95,9 +95,10 @@ class SynapseError(CodeMessageException):
""" """
super(SynapseError, self).__init__(code, msg) super(SynapseError, self).__init__(code, msg)
self.errcode = errcode self.errcode = errcode
self.soft_logout = soft_logout
def error_dict(self): def error_dict(self):
return cs_error(self.msg, self.errcode, self.softLogout) return cs_error(self.msg, self.errcode, self.soft_logout)
class ProxiedRequestError(SynapseError): class ProxiedRequestError(SynapseError):
@ -383,7 +384,7 @@ class RequestSendFailed(RuntimeError):
self.can_retry = can_retry self.can_retry = can_retry
def cs_error(msg, code=Codes.UNKNOWN, softLogout=False, **kwargs): def cs_error(msg, code=Codes.UNKNOWN, soft_logout=False, **kwargs):
""" Utility method for constructing an error response for client-server """ Utility method for constructing an error response for client-server
interactions. interactions.
@ -394,7 +395,7 @@ def cs_error(msg, code=Codes.UNKNOWN, softLogout=False, **kwargs):
Returns: Returns:
A dict representing the error response JSON. A dict representing the error response JSON.
""" """
err = {"error": msg, "errcode": code, "soft_logout": softLogout} err = {"error": msg, "errcode": code, "soft_logout": soft_logout}
for key, value in iteritems(kwargs): for key, value in iteritems(kwargs):
err[key] = value err[key] = value
return err return err