diff options
| author | Mark Haines <mark.haines@matrix.org> | 2014-10-27 11:14:11 +0000 |
|---|---|---|
| committer | Mark Haines <mark.haines@matrix.org> | 2014-10-27 11:14:11 +0000 |
| commit | acb2d171e88f7e5a60f6468e5b4f39fdb1ce94a3 (patch) | |
| tree | 98b171bd5303e03ee123708f6ed96932f29db558 /synapse/config | |
| parent | Add script to hash exisitng history (diff) | |
| parent | Test pyflakes jenikns integration (diff) | |
| download | synapse-acb2d171e88f7e5a60f6468e5b4f39fdb1ce94a3.tar.xz | |
Merge branch 'develop' into event_signing
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/server.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/config/server.py b/synapse/config/server.py index d9d8d0e14e..086937044f 100644 --- a/synapse/config/server.py +++ b/synapse/config/server.py @@ -74,7 +74,7 @@ class ServerConfig(Config): return syutil.crypto.signing_key.read_signing_keys( signing_keys.splitlines(True) ) - except Exception as e: + except Exception: raise ConfigError( "Error reading signing_key." " Try running again with --generate-config" @@ -94,7 +94,7 @@ class ServerConfig(Config): with open(args.signing_key_path, "w") as signing_key_file: syutil.crypto.signing_key.write_signing_keys( signing_key_file, - (syutil.crypto.SigningKey.generate("auto"),), + (syutil.crypto.signing_key.generate_singing_key("auto"),), ) else: signing_keys = cls.read_file(args.signing_key_path, "signing_key") |