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

Include errcode on Internal Server Error
matrix-org · Dec 16, 2015 · 5fc0344 · 5fc0344
2 parents 4fab578 + 338c0a8
commit 5fc0344
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/synapse/http/server.py b/synapse/http/server.py
@@ -15,7 +15,7 @@
 
 
 from synapse.api.errors import (
-    cs_exception, SynapseError, CodeMessageException, UnrecognizedRequestError
+    cs_exception, SynapseError, CodeMessageException, UnrecognizedRequestError, Codes
 )
 from synapse.util.logcontext import LoggingContext, PreserveLoggingContext
 import synapse.metrics
@@ -127,7 +127,10 @@ def wrapped_request_handler(self, request):
                     respond_with_json(
                         request,
                         500,
-                        {"error": "Internal server error"},
+                        {
+                            "error": "Internal server error",
+                            "errcode": Codes.M_UNKNOWN,
+                        },
                         send_cors=True
                     )
     return wrapped_request_handler