mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-08 23:43:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

mediaapi/writers/download: getMatrixUrls -> getMatrixURLs

Browse source
This commit is contained in:
Robert Swain 2017-05-22 16:41:46 +02:00
parent 0fcf74014d
commit 8626308dac
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/github.com/matrix-org/dendrite/mediaapi/writers/download.go
View file

@ -247,7 +247,7 @@ func (r *downloadRequest) respondFromLocalFile(w http.ResponseWriter, absBasePat
} }
func (r *downloadRequest) createRemoteRequest() (*http.Response, *util.JSONResponse) { func (r *downloadRequest) createRemoteRequest() (*http.Response, *util.JSONResponse) {
urls := getMatrixUrls(r.MediaMetadata.Origin) urls := getMatrixURLs(r.MediaMetadata.Origin)
r.Logger.WithField("URL", urls[0]).Info("Connecting to remote") r.Logger.WithField("URL", urls[0]).Info("Connecting to remote")
@ -504,7 +504,7 @@ func (r *downloadRequest) respondFromRemoteFile(w http.ResponseWriter, absBasePa
// Given a matrix server name, attempt to discover URLs to contact the server // Given a matrix server name, attempt to discover URLs to contact the server
// on. // on.
func getMatrixUrls(serverName gomatrixserverlib.ServerName) []string { func getMatrixURLs(serverName gomatrixserverlib.ServerName) []string {
_, srvs, err := net.LookupSRV("matrix", "tcp", string(serverName)) _, srvs, err := net.LookupSRV("matrix", "tcp", string(serverName))
if err != nil { if err != nil {
return []string{"https://" + string(serverName) + ":8448"} return []string{"https://" + string(serverName) + ":8448"}