diff options
| author | Erik Johnston <erik@matrix.org> | 2017-10-23 13:13:53 +0100 |
|---|---|---|
| committer | Erik Johnston <erik@matrix.org> | 2017-10-23 13:13:53 +0100 |
| commit | ffba97807746f6f0d7a8820c0d980f188dcad08c (patch) | |
| tree | 36301e98cdc6400afe71b89fc4b0c8beccd0deea /synapse/config/key.py | |
| parent | Merge pull request #2540 from 4nd3r/patch-1 (diff) | |
| parent | Bump version and changelog (diff) | |
| download | synapse-ffba97807746f6f0d7a8820c0d980f188dcad08c.tar.xz | |
Merge branch 'release-v0.24.0' of github.com:matrix-org/synapse v0.24.0
Diffstat (limited to 'synapse/config/key.py')
| -rw-r--r-- | synapse/config/key.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index 6ee643793e..4b8fc063d0 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -118,10 +118,9 @@ class KeyConfig(Config): signing_keys = self.read_file(signing_key_path, "signing_key") try: return read_signing_keys(signing_keys.splitlines(True)) - except Exception: + except Exception as e: raise ConfigError( - "Error reading signing_key." - " Try running again with --generate-config" + "Error reading signing_key: %s" % (str(e)) ) def read_old_signing_keys(self, old_signing_keys): @@ -141,7 +140,8 @@ class KeyConfig(Config): def generate_files(self, config): signing_key_path = config["signing_key_path"] - if not os.path.exists(signing_key_path): + + if not self.path_exists(signing_key_path): with open(signing_key_path, "w") as signing_key_file: key_id = "a_" + random_string(4) write_signing_keys( |