summary refs log tree commit diff
path: root/synapse/config/_base.py
diff options
context:
space:
mode:
authorMark Haines <mark.haines@matrix.org>2015-04-24 17:01:34 +0100
committerMark Haines <mark.haines@matrix.org>2015-04-24 17:01:34 +0100
commit288702170d6fc8b44926856b37e4a0e1bb5b2ac4 (patch)
treec4819aaad46052f885540513b87e807a7d2e6cc9 /synapse/config/_base.py
parentMerge branch 'develop' into key_distribution (diff)
downloadsynapse-288702170d6fc8b44926856b37e4a0e1bb5b2ac4.tar.xz
Add config for setting the perspective servers
Diffstat (limited to 'synapse/config/_base.py')
-rw-r--r--synapse/config/_base.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/_base.py b/synapse/config/_base.py

index f07ea4cc46..6fd086a471 100644 --- a/synapse/config/_base.py +++ b/synapse/config/_base.py
@@ -83,9 +83,9 @@ class Config(object): with open(file_path) as file_stream: try: return yaml.load(file_stream) - except Exception as e: + except: raise ConfigError( - "Error parsing yaml in file %r: " % (file_path,), e + "Error parsing yaml in file %r" % (file_path,) ) @staticmethod