MirrorHub/dendrite
0
0
Fork 0
mirror of https://github.com/matrix-org/dendrite synced 2024-12-15 13:13:45 +01:00
Code Issues Releases Wiki Activity

Use process context as base context for all HTTP

Browse source
This commit is contained in:
Neil Alexander 2022-04-27 15:01:57 +01:00
parent 655ac3e8fb
commit cafa2853c5
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
1 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
setup/base/base.go
View file

@ -346,6 +346,9 @@ func (b *BaseDendrite) SetupAndServeHTTP(
Addr: string(externalAddr), Addr: string(externalAddr),
WriteTimeout: HTTPServerTimeout, WriteTimeout: HTTPServerTimeout,
Handler: externalRouter, Handler: externalRouter,
BaseContext: func(_ net.Listener) context.Context {
return b.ProcessContext.Context()
},
} }
internalServ := externalServ internalServ := externalServ
@ -361,6 +364,9 @@ func (b *BaseDendrite) SetupAndServeHTTP(
internalServ = &http.Server{ internalServ = &http.Server{
Addr: string(internalAddr), Addr: string(internalAddr),
Handler: h2c.NewHandler(internalRouter, internalH2S), Handler: h2c.NewHandler(internalRouter, internalH2S),
BaseContext: func(_ net.Listener) context.Context {
return b.ProcessContext.Context()
},
} }
} }