summary refs log tree commit diff
diff options
context:
space:
mode:
authorKegan Dougal <kegan@matrix.org>2014-09-03 16:31:01 +0100
committerKegan Dougal <kegan@matrix.org>2014-09-03 16:31:01 +0100
commitbeaf50f5c603546111b5b25b9c0f22f18f38480b (patch)
tree8f474ba925e2c9b69edb7c1453631d8da3ddafdd
parentAdd exception handling to directory servlet, so we don't 500. Mark directory ... (diff)
downloadsynapse-beaf50f5c603546111b5b25b9c0f22f18f38480b.tar.xz
Bubble up SynapseErrors so expected failures aren't masked.
-rw-r--r--synapse/rest/directory.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/rest/directory.py b/synapse/rest/directory.py
index d02b15395b..65aa2196c2 100644
--- a/synapse/rest/directory.py
+++ b/synapse/rest/directory.py
@@ -71,6 +71,8 @@ class ClientDirectoryServer(RestServlet):
             yield dir_handler.create_association(
                 room_alias, room_id, servers
             )
+        except SynapseError as e:
+            raise e
         except:
             logger.exception("Failed to create association")