diff --git a/setup/base.go b/setup/base.go index 82bbfd782..f8b5ace00 100644 --- a/setup/base.go +++ b/setup/base.go @@ -113,18 +113,15 @@ func NewBaseDendrite(cfg *config.Dendrite, componentName string, useHTTPAPIs boo } var dnsCache *gomatrixserverlib.DNSCache - if cfg.Matrix.DNSCache.Enabled { - dnsCache, err = gomatrixserverlib.NewDNSCache( - cfg.Matrix.DNSCache.CacheSize, - cfg.Matrix.DNSCache.CacheLifetime, + if cfg.Global.DNSCache.Enabled { + dnsCache = gomatrixserverlib.NewDNSCache( + cfg.Global.DNSCache.CacheSize, + cfg.Global.DNSCache.CacheLifetime, ) - if err != nil { - logrus.WithError(err).Warnf("Failed to create DNS cache") - } logrus.Infof( "DNS cache enabled (size %d, lifetime %s)", - cfg.Matrix.DNSCache.CacheSize, - cfg.Matrix.DNSCache.CacheLifetime, + cfg.Global.DNSCache.CacheSize, + cfg.Global.DNSCache.CacheLifetime, ) } diff --git a/setup/config/config_global.go b/setup/config/config_global.go index 3be785893..d4b068dbe 100644 --- a/setup/config/config_global.go +++ b/setup/config/config_global.go @@ -162,6 +162,6 @@ func (c *DNSCacheOptions) Defaults() { } func (c *DNSCacheOptions) Verify(configErrs *ConfigErrors, isMonolith bool) { - checkPositive(configErrs, "cache_size", c.CacheSize) - checkPositive(configErrs, "cache_lifetime", c.CacheLifetime) + checkPositive(configErrs, "cache_size", int64(c.CacheSize)) + checkPositive(configErrs, "cache_lifetime", int64(c.CacheLifetime)) }