aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorS7evinK <tfaelligen@gmail.com>2021-07-16 20:42:53 +0200
committerGitHub <noreply@github.com>2021-07-16 19:42:53 +0100
commitb954343d734a4798b14d886d0d851ff9e526117d (patch)
tree29ef72669d984497a35d53951c2833f7ed296c8a
parent728061db0320f578eebc3d249bdca46ee49fe219 (diff)
Fix DNS CacheLifetime (#1926)
Signed-off-by: Till Faelligen <tfaelligen@gmail.com>
-rw-r--r--dendrite-config.yaml2
-rw-r--r--setup/base.go5
2 files changed, 3 insertions, 4 deletions
diff --git a/dendrite-config.yaml b/dendrite-config.yaml
index 0ea584aa..31b83066 100644
--- a/dendrite-config.yaml
+++ b/dendrite-config.yaml
@@ -112,7 +112,7 @@ global:
# Maximum number of entries to hold in the DNS cache, and
# for how long those items should be considered valid in seconds.
cache_size: 256
- cache_lifetime: 300
+ cache_lifetime: "5m" # 5minutes; see https://pkg.go.dev/time@master#ParseDuration for more
# Configuration for the Appservice API.
app_service_api:
diff --git a/setup/base.go b/setup/base.go
index 7b691608..1a52d1c2 100644
--- a/setup/base.go
+++ b/setup/base.go
@@ -139,15 +139,14 @@ func NewBaseDendrite(cfg *config.Dendrite, componentName string, useHTTPAPIs boo
var dnsCache *gomatrixserverlib.DNSCache
if cfg.Global.DNSCache.Enabled {
- lifetime := time.Second * cfg.Global.DNSCache.CacheLifetime
dnsCache = gomatrixserverlib.NewDNSCache(
cfg.Global.DNSCache.CacheSize,
- lifetime,
+ cfg.Global.DNSCache.CacheLifetime,
)
logrus.Infof(
"DNS cache enabled (size %d, lifetime %s)",
cfg.Global.DNSCache.CacheSize,
- lifetime,
+ cfg.Global.DNSCache.CacheLifetime,
)
}