- Fix that cachedb does not warn when serve-expired is disabled about

  use of serve-expired-reply-ttl and serve-expired-client-timeout.

diff --git a/cachedb/cachedb.c b/cachedb/cachedb.c
index 30645268ca23b8c407b016c54dca2b4ae7fa35a2..573017eefecf74e45d94e23256fba619e693b24f 100644 (file)
--- a/cachedb/cachedb.c
+++ b/cachedb/cachedb.c
@@ -265,11 +265,11 @@ cachedb_init(struct module_env* env, int id)
                return 0;
        }
        cachedb_env->enabled = 1;
-       if(env->cfg->serve_expired_reply_ttl)
+       if(env->cfg->serve_expired && env->cfg->serve_expired_reply_ttl)
                log_warn(
                        "cachedb: serve-expired-reply-ttl is set but not working for data "
-                       "originating from the external cache; 0 TLL is used for those.");
-       if(env->cfg->serve_expired_client_timeout)
+                       "originating from the external cache; 0 TTL is used for those.");
+       if(env->cfg->serve_expired && env->cfg->serve_expired_client_timeout)
                log_warn(
                        "cachedb: serve-expired-client-timeout is set but not working for "
                        "data originating from the external cache; expired data are used "

diff --git a/doc/Changelog b/doc/Changelog
index d1e3b684626b7a67ad700d75f53ad32e43c46256..60e61d7b95eae40ab6744e15ff53b5056f9c2b77 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -4,6 +4,8 @@
 
 11 October 2023: Wouter
        - Fix #949: "could not create control compt".
+       - Fix that cachedb does not warn when serve-expired is disabled about
+         use of serve-expired-reply-ttl and serve-expired-client-timeout.
 
 10 October 2023: George
        - Fix infinite loop when reading multiple lines of input on a broken