mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-20 21:33:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix comments, don't use federation sender URL in polylith mode

Browse source
This commit is contained in:
Neil Alexander 2020-05-26 17:58:31 +01:00
parent e182cb524c
commit 11de37e2a7
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
internal/basecomponent/base.go
View file

@ -154,11 +154,11 @@ func (b *BaseDendrite) CreateHTTPFederationSenderAPIs() federationSenderAPI.Fede
return f return f
} }
// CreateHTTPFederationSenderAPIs returns FederationSenderInternalAPI for hitting // CreateHTTPServerKeyAPIs returns ServerKeyInternalAPI for hitting the server key
// the federation sender over HTTP // API over HTTP
func (b *BaseDendrite) CreateHTTPServerKeyAPIs() serverKeyAPI.ServerKeyInternalAPI { func (b *BaseDendrite) CreateHTTPServerKeyAPIs() serverKeyAPI.ServerKeyInternalAPI {
f, err := serverKeyAPI.NewServerKeyInternalAPIHTTP( f, err := serverKeyAPI.NewServerKeyInternalAPIHTTP(
b.Cfg.FederationSenderURL(), b.Cfg.ServerKeyAPIURL(),
b.httpClient, b.httpClient,
b.ImmutableCache, b.ImmutableCache,
) )

9
internal/config/config.go
View file

@ -753,6 +753,15 @@ func (config *Dendrite) FederationSenderURL() string {
return "http://" + string(config.Listen.FederationSender) return "http://" + string(config.Listen.FederationSender)
} }
// FederationSenderURL returns an HTTP URL for where the federation sender is listening.
func (config *Dendrite) ServerKeyAPIURL() string {
// Hard code the server key API server to talk HTTP for now.
// If we support HTTPS we need to think of a practical way to do certificate validation.
// People setting up servers shouldn't need to get a certificate valid for the public
// internet for an internal API.
return "http://" + string(config.Listen.ServerKeyAPI)
}
// SetupTracing configures the opentracing using the supplied configuration. // SetupTracing configures the opentracing using the supplied configuration.
func (config *Dendrite) SetupTracing(serviceName string) (closer io.Closer, err error) { func (config *Dendrite) SetupTracing(serviceName string) (closer io.Closer, err error) {
if !config.Tracing.Enabled { if !config.Tracing.Enabled {