Merge pull request #440 from matrix-org/daniel/ise

Include errcode on Internal Server Error
This commit is contained in:
Mark Haines 2015-12-16 11:26:55 +00:00
commit 5fc03449c8

View File

@ -15,7 +15,7 @@
from synapse.api.errors import ( from synapse.api.errors import (
cs_exception, SynapseError, CodeMessageException, UnrecognizedRequestError cs_exception, SynapseError, CodeMessageException, UnrecognizedRequestError, Codes
) )
from synapse.util.logcontext import LoggingContext, PreserveLoggingContext from synapse.util.logcontext import LoggingContext, PreserveLoggingContext
import synapse.metrics import synapse.metrics
@ -127,7 +127,10 @@ def request_handler(request_handler):
respond_with_json( respond_with_json(
request, request,
500, 500,
{"error": "Internal server error"}, {
"error": "Internal server error",
"errcode": Codes.M_UNKNOWN,
},
send_cors=True send_cors=True
) )
return wrapped_request_handler return wrapped_request_handler