diff options
| author | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 12:32:07 -0400 |
|---|---|---|
| committer | Hubert Chathi <hubert@uhoreg.ca> | 2019-10-31 12:32:07 -0400 |
| commit | 9c94b48bf154fff1ac3550213ddb65b33fbb6ba8 (patch) | |
| tree | e7ad5ba3aa90d3cb57906bf38d3c2cac352e95d3 /synapse/config | |
| parent | clean up code a bit (diff) | |
| parent | Update black to 19.10b0 (#6304) (diff) | |
| download | synapse-9c94b48bf154fff1ac3550213ddb65b33fbb6ba8.tar.xz | |
Merge branch 'develop' into uhoreg/cross_signing_fix_workers_notify
Diffstat (limited to 'synapse/config')
| -rw-r--r-- | synapse/config/key.py | 4 | ||||
| -rw-r--r-- | synapse/config/logger.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/synapse/config/key.py b/synapse/config/key.py index ec5d430afb..52ff1b2621 100644 --- a/synapse/config/key.py +++ b/synapse/config/key.py @@ -125,7 +125,7 @@ class KeyConfig(Config): # if neither trusted_key_servers nor perspectives are given, use the default. if "perspectives" not in config and "trusted_key_servers" not in config: - logger.warn(TRUSTED_KEY_SERVER_NOT_CONFIGURED_WARN) + logger.warning(TRUSTED_KEY_SERVER_NOT_CONFIGURED_WARN) key_servers = [{"server_name": "matrix.org"}] else: key_servers = config.get("trusted_key_servers", []) @@ -156,7 +156,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 macaroon_secret_key") + logger.warning("Config is missing macaroon_secret_key") seed = bytes(self.signing_key[0]) self.macaroon_secret_key = hashlib.sha256(seed).digest() diff --git a/synapse/config/logger.py b/synapse/config/logger.py index be92e33f93..2d2c1e54df 100644 --- a/synapse/config/logger.py +++ b/synapse/config/logger.py @@ -182,7 +182,7 @@ def _reload_stdlib_logging(*args, log_config=None): logger = logging.getLogger("") if not log_config: - logger.warn("Reloaded a blank config?") + logger.warning("Reloaded a blank config?") logging.config.dictConfig(log_config) |