diff options
| author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2020-06-16 12:44:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-16 12:44:07 +0100 |
| commit | 03619324fc18632a2907ace4d3e73f3c4dd0b05e (patch) | |
| tree | f3873d5b6b6007d2ae1d6462fef4efbe7caee816 /synapse/http/site.py | |
| parent | Merge branch 'master' into develop (diff) | |
| download | synapse-03619324fc18632a2907ace4d3e73f3c4dd0b05e.tar.xz | |
Create a ListenerConfig object (#7681)
This ended up being a bit more invasive than I'd hoped for (not helped by generic_worker duplicating some of the code from homeserver), but hopefully it's an improvement. The idea is that, rather than storing unstructured `dict`s in the config for the listener configurations, we instead parse it into a structured `ListenerConfig` object.
Diffstat (limited to 'synapse/http/site.py')
| -rw-r--r-- | synapse/http/site.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/synapse/http/site.py b/synapse/http/site.py index 167293c46d..cbc37eac6e 100644 --- a/synapse/http/site.py +++ b/synapse/http/site.py @@ -19,6 +19,7 @@ from typing import Optional from twisted.python.failure import Failure from twisted.web.server import Request, Site +from synapse.config.server import ListenerConfig from synapse.http import redact_uri from synapse.http.request_metrics import RequestMetrics, requests_counter from synapse.logging.context import LoggingContext, PreserveLoggingContext @@ -350,7 +351,7 @@ class SynapseSite(Site): self, logger_name, site_tag, - config, + config: ListenerConfig, resource, server_version_string, *args, @@ -360,7 +361,8 @@ class SynapseSite(Site): self.site_tag = site_tag - proxied = config.get("x_forwarded", False) + assert config.http_options is not None + proxied = config.http_options.x_forwarded self.requestFactory = XForwardedForRequest if proxied else SynapseRequest self.access_logger = logging.getLogger(logger_name) self.server_version_string = server_version_string.encode("ascii") |