diff options
| author | Brendan Abolivier <babolivier@matrix.org> | 2019-02-18 14:52:23 +0000 |
|---|---|---|
| committer | Brendan Abolivier <babolivier@matrix.org> | 2019-02-18 14:52:23 +0000 |
| commit | 68a53f825fc3ecb415571bda2bfc7c1df5edefb7 (patch) | |
| tree | 8f71f2a3123fe30230d798259eca391794c52d48 /synapse/config/key.py | |
| parent | Typo in changelog (diff) | |
| parent | Merge pull request #4643 from matrix-org/erikj/catch_exceptions (diff) | |
| download | synapse-68a53f825fc3ecb415571bda2bfc7c1df5edefb7.tar.xz | |
Merge branch 'develop' into babolivier/acme-delegated
Diffstat (limited to 'synapse/config/key.py')
| -rw-r--r-- | synapse/config/key.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index dce4b19a2d..499ffd4e06 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -56,7 +56,7 @@ class KeyConfig(Config): if not self.macaroon_secret_key: # Unfortunately, there are people out there that don't have this # set. Lets just be "nice" and derive one from their secret key. - logger.warn("Config is missing missing macaroon_secret_key") + logger.warn("Config is missing macaroon_secret_key") seed = bytes(self.signing_key[0]) self.macaroon_secret_key = hashlib.sha256(seed).digest() |