summary refs log tree commit diff
path: root/synapse/storage
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2016-01-14 11:06:19 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2016-01-14 11:06:19 +0000
commit27927463a140fd95dd25b2bc2ea4c2d06e4ebf3d (patch)
treedbf1f6ee9cecaebcd7b0ea02a4189c246a8dec2f /synapse/storage
parentMerge pull request #493 from matrix-org/daniel/1 (diff)
parentDon't start server if ASes are invalidly configured (diff)
downloadsynapse-27927463a140fd95dd25b2bc2ea4c2d06e4ebf3d.tar.xz
Merge pull request #494 from matrix-org/daniel/2
Don't start server if ASes are invalidly configured
Diffstat (limited to 'synapse/storage')
-rw-r--r--synapse/storage/appservice.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/synapse/storage/appservice.py b/synapse/storage/appservice.py
index 1a2b4678a2..f4bc457eca 100644
--- a/synapse/storage/appservice.py
+++ b/synapse/storage/appservice.py
@@ -206,6 +206,7 @@ class ApplicationServiceStore(SQLBaseStore):
             except Exception as e:
                 logger.error("Failed to load appservice from '%s'", config_file)
                 logger.exception(e)
+                raise
 
 
 class ApplicationServiceTransactionStore(SQLBaseStore):