diff options
| author | Richard van der Hoff <richard@matrix.org> | 2019-02-11 21:16:00 +0000 |
|---|---|---|
| committer | Richard van der Hoff <richard@matrix.org> | 2019-02-11 21:16:00 +0000 |
| commit | be794c7cf71dce6d1743fbdf4dbb16040961b33d (patch) | |
| tree | a1f110905290436af40e0026d8116ffb8e234ef5 /synapse/app | |
| parent | Fail cleanly if listener config lacks a 'port' (diff) | |
| parent | Logging improvements around TLS certs (diff) | |
| download | synapse-be794c7cf71dce6d1743fbdf4dbb16040961b33d.tar.xz | |
Merge branch 'rav/tls_config_logging_fixes' into rav/tls_cert/work
Diffstat (limited to 'synapse/app')
| -rw-r--r-- | synapse/app/_base.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/synapse/app/_base.py b/synapse/app/_base.py index e1fc1afd5b..6d72de1daa 100644 --- a/synapse/app/_base.py +++ b/synapse/app/_base.py @@ -213,13 +213,11 @@ def refresh_certificate(hs): Refresh the TLS certificates that Synapse is using by re-reading them from disk and updating the TLS context factories to use them. """ - logging.info("Loading certificate from disk...") hs.config.read_certificate_from_disk() hs.tls_server_context_factory = context_factory.ServerContextFactory(hs.config) - logging.info("Certificate loaded.") if hs._listening_services: - logging.info("Updating context factories...") + logger.info("Updating context factories...") for i in hs._listening_services: # When you listenSSL, it doesn't make an SSL port but a TCP one with # a TLS wrapping factory around the factory you actually want to get @@ -234,7 +232,7 @@ def refresh_certificate(hs): False, i.factory.wrappedFactory ) - logging.info("Context factories updated.") + logger.info("Context factories updated.") def start(hs, listeners=None): |