Merge branch 'bindpatch' of github.com:aditsachde/dendrite into bindpatch

This commit is contained in:
Adit Sachde 2019-10-01 14:58:56 -04:00
commit 8ff707d1e3

View file

@ -151,7 +151,8 @@ func (b *BaseDendrite) CreateFederationClient() *gomatrixserverlib.FederationCli
// SetupAndServeHTTP sets up the HTTP server to serve endpoints registered on
// ApiMux under /api/ and adds a prometheus handler under /metrics.
func (b *BaseDendrite) SetupAndServeHTTP(bindaddr string, listenaddr string) {
// If a separate bind address is defined, listen on that. Otherwise use
// the listen address
var addr string
if bindaddr != "" {
addr = bindaddr