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

Fix build errors

Browse source
This commit is contained in:
Neil Alexander 2021-01-22 11:23:04 +00:00
parent 200175343f
commit 2453bb57a4
No known key found for this signature in database
GPG key ID: A02A2019A2BB0944
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
setup/base.go
View file

@ -113,18 +113,15 @@ func NewBaseDendrite(cfg *config.Dendrite, componentName string, useHTTPAPIs boo
} }
var dnsCache *gomatrixserverlib.DNSCache var dnsCache *gomatrixserverlib.DNSCache
if cfg.Matrix.DNSCache.Enabled { if cfg.Global.DNSCache.Enabled {
dnsCache, err = gomatrixserverlib.NewDNSCache( dnsCache = gomatrixserverlib.NewDNSCache(
cfg.Matrix.DNSCache.CacheSize, cfg.Global.DNSCache.CacheSize,
cfg.Matrix.DNSCache.CacheLifetime, cfg.Global.DNSCache.CacheLifetime,
) )
if err != nil {
logrus.WithError(err).Warnf("Failed to create DNS cache")
}
logrus.Infof( logrus.Infof(
"DNS cache enabled (size %d, lifetime %s)", "DNS cache enabled (size %d, lifetime %s)",
cfg.Matrix.DNSCache.CacheSize, cfg.Global.DNSCache.CacheSize,
cfg.Matrix.DNSCache.CacheLifetime, cfg.Global.DNSCache.CacheLifetime,
) )
} }

4
setup/config/config_global.go
View file

@ -162,6 +162,6 @@ func (c *DNSCacheOptions) Defaults() {
} }
func (c *DNSCacheOptions) Verify(configErrs *ConfigErrors, isMonolith bool) { func (c *DNSCacheOptions) Verify(configErrs *ConfigErrors, isMonolith bool) {
checkPositive(configErrs, "cache_size", c.CacheSize) checkPositive(configErrs, "cache_size", int64(c.CacheSize))
checkPositive(configErrs, "cache_lifetime", c.CacheLifetime) checkPositive(configErrs, "cache_lifetime", int64(c.CacheLifetime))
} }