summary refs log tree commit diff
path: root/synapse/api
diff options
context:
space:
mode:
authorErik Johnston <erik@matrix.org>2015-02-04 16:28:12 +0000
committerErik Johnston <erik@matrix.org>2015-02-04 16:28:12 +0000
commitae46f10fc5dba0f81518e3144ab8d9ed7a7d03bc (patch)
treeca543f43db03346741aae11c9b575e66a39dbf7a /synapse/api
parentWhen returning lists of servers from alias lookups, put the current server fi... (diff)
downloadsynapse-ae46f10fc5dba0f81518e3144ab8d9ed7a7d03bc.tar.xz
Apply sanity to the transport client interface. Convert 'make_join' and 'send_join' to accept iterables of destinations
Diffstat (limited to 'synapse/api')
-rw-r--r--synapse/api/errors.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/synapse/api/errors.py b/synapse/api/errors.py
index ad478aa6b7..5041828f18 100644
--- a/synapse/api/errors.py
+++ b/synapse/api/errors.py
@@ -39,7 +39,7 @@ class Codes(object):
     TOO_LARGE = "M_TOO_LARGE"
 
 
-class CodeMessageException(Exception):
+class CodeMessageException(RuntimeError):
     """An exception with integer code and message string attributes."""
 
     def __init__(self, code, msg):
@@ -227,3 +227,9 @@ class FederationError(RuntimeError):
             "affected": self.affected,
             "source": self.source if self.source else self.affected,
         }
+
+
+class HttpResponseException(CodeMessageException):
+    def __init__(self, code, msg, response):
+        self.response = response
+        super(HttpResponseException, self).__init__(code, msg)