From 3485634910eaa0515023031c1adbb28b2bf8cda2 Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 22 Jan 2021 13:09:52 +0000 Subject: [PATCH] Use WithDNScache --- go.mod | 2 +- go.sum | 4 ++-- setup/base.go | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 5b7c688a8..c097b203e 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/matrix-org/go-http-js-libp2p v0.0.0-20200518170932-783164aeeda4 github.com/matrix-org/go-sqlite3-js v0.0.0-20200522092705-bc8506ccbcf3 github.com/matrix-org/gomatrix v0.0.0-20200827122206-7dd5e2a05bcd - github.com/matrix-org/gomatrixserverlib v0.0.0-20210122110637-50a9cc46ddc2 + github.com/matrix-org/gomatrixserverlib v0.0.0-20210122130819-61624ef0ed34 github.com/matrix-org/naffka v0.0.0-20200901083833-bcdd62999a91 github.com/matrix-org/util v0.0.0-20200807132607-55161520e1d4 github.com/mattn/go-sqlite3 v1.14.2 diff --git a/go.sum b/go.sum index a76595ebb..8bf21e907 100644 --- a/go.sum +++ b/go.sum @@ -567,8 +567,8 @@ github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26 h1:Hr3zjRsq2bh github.com/matrix-org/gomatrix v0.0.0-20190528120928-7df988a63f26/go.mod h1:3fxX6gUjWyI/2Bt7J1OLhpCzOfO/bB3AiX0cJtEKud0= github.com/matrix-org/gomatrix v0.0.0-20200827122206-7dd5e2a05bcd h1:xVrqJK3xHREMNjwjljkAUaadalWc0rRbmVuQatzmgwg= github.com/matrix-org/gomatrix v0.0.0-20200827122206-7dd5e2a05bcd/go.mod h1:/gBX06Kw0exX1HrwmoBibFA98yBk/jxKpGVeyQbff+s= -github.com/matrix-org/gomatrixserverlib v0.0.0-20210122110637-50a9cc46ddc2 h1:fB4L+NuszizP9xPYWhQpsx3svkJGZxq18lsPf3VKqFI= -github.com/matrix-org/gomatrixserverlib v0.0.0-20210122110637-50a9cc46ddc2/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU= +github.com/matrix-org/gomatrixserverlib v0.0.0-20210122130819-61624ef0ed34 h1:mmBsi7W8H69Nn0U6+FeLHJK8wZqIj4gUit60v80N1Fk= +github.com/matrix-org/gomatrixserverlib v0.0.0-20210122130819-61624ef0ed34/go.mod h1:JsAzE1Ll3+gDWS9JSUHPJiiyAksvOOnGWF2nXdg4ZzU= github.com/matrix-org/naffka v0.0.0-20200901083833-bcdd62999a91 h1:HJ6U3S3ljJqNffYMcIeAncp5qT/i+ZMiJ2JC2F0aXP4= github.com/matrix-org/naffka v0.0.0-20200901083833-bcdd62999a91/go.mod h1:sjyPyRxKM5uw1nD2cJ6O2OxI6GOqyVBfNXqKjBZTBZE= github.com/matrix-org/util v0.0.0-20190711121626-527ce5ddefc7 h1:ntrLa/8xVzeSs8vHFHK25k0C+NV74sYMJnNSg5NoSRo= diff --git a/setup/base.go b/setup/base.go index ce9a0c576..f430734e3 100644 --- a/setup/base.go +++ b/setup/base.go @@ -270,7 +270,7 @@ func (b *BaseDendrite) CreateClient() *gomatrixserverlib.Client { } opts := []interface{}{} if b.Cfg.Global.DNSCache.Enabled { - opts = append(opts, b.DNSCache) + opts = append(opts, gomatrixserverlib.WithDNSCache{Cache: b.DNSCache}) } client := gomatrixserverlib.NewClient( b.Cfg.FederationSender.DisableTLSValidation, opts..., @@ -290,7 +290,7 @@ func (b *BaseDendrite) CreateFederationClient() *gomatrixserverlib.FederationCli } opts := []interface{}{} if b.Cfg.Global.DNSCache.Enabled { - opts = append(opts, b.DNSCache) + opts = append(opts, gomatrixserverlib.WithDNSCache{Cache: b.DNSCache}) } client := gomatrixserverlib.NewFederationClientWithTimeout( b.Cfg.Global.ServerName, b.Cfg.Global.KeyID, b.Cfg.Global.PrivateKey,