mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2025-05-02 10:56:06 -04:00
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.
This commit is contained in:
parent
789606577a
commit
03619324fc
13 changed files with 248 additions and 167 deletions
|
@ -24,6 +24,7 @@ from twisted.web.resource import Resource
|
|||
from twisted.web.server import NOT_DONE_YET
|
||||
|
||||
from synapse.api.errors import Codes, RedirectException, SynapseError
|
||||
from synapse.config.server import parse_listener_def
|
||||
from synapse.http.server import (
|
||||
DirectServeResource,
|
||||
JsonResource,
|
||||
|
@ -189,7 +190,13 @@ class OptionsResourceTests(unittest.TestCase):
|
|||
request.prepath = [] # This doesn't get set properly by make_request.
|
||||
|
||||
# Create a site and query for the resource.
|
||||
site = SynapseSite("test", "site_tag", {}, self.resource, "1.0")
|
||||
site = SynapseSite(
|
||||
"test",
|
||||
"site_tag",
|
||||
parse_listener_def({"type": "http", "port": 0}),
|
||||
self.resource,
|
||||
"1.0",
|
||||
)
|
||||
request.site = site
|
||||
resource = site.getResourceFor(request)
|
||||
|
||||
|
@ -348,7 +355,9 @@ class SiteTestCase(unittest.HomeserverTestCase):
|
|||
# time out the request while it's 'processing'
|
||||
base_resource = Resource()
|
||||
base_resource.putChild(b"", HangingResource())
|
||||
site = SynapseSite("test", "site_tag", {}, base_resource, "1.0")
|
||||
site = SynapseSite(
|
||||
"test", "site_tag", self.hs.config.listeners[0], base_resource, "1.0"
|
||||
)
|
||||
|
||||
server = site.buildProtocol(None)
|
||||
client = AccumulatingProtocol()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue