From 1950cf85b47f7c8407b3318a4f8fc57c0af6d6ba Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Sat, 18 Apr 2020 15:36:54 +0100 Subject: readsocket expansion: response caching --- test/stderr/2200 | 2 +- test/stderr/2201 | 2 +- test/stderr/2610 | 4 ++-- test/stderr/2620 | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'test/stderr') diff --git a/test/stderr/2200 b/test/stderr/2200 index c8320321a..ba50dffa7 100644 --- a/test/stderr/2200 +++ b/test/stderr/2200 @@ -43,7 +43,7 @@ search_tidyup called LRU list: internal_search_find: file="NULL" type=dnsdb key="a=shorthost.test.ex" opts=NULL - cached data found but either wrong opts or dated; database lookup required for a=shorthost.test.ex + cached data found but out-of-date; database lookup required for a=shorthost.test.ex dnsdb key: shorthost.test.ex lookup yielded: 127.0.0.1 LOG: MAIN diff --git a/test/stderr/2201 b/test/stderr/2201 index fb618fc64..8f9d0b585 100644 --- a/test/stderr/2201 +++ b/test/stderr/2201 @@ -176,7 +176,7 @@ search_find: file="NULL" LRU list: internal_search_find: file="NULL" type=dnsdb key="a=shorthost.test.ex" opts=NULL -cached data found but either wrong opts or dated; database lookup required for a=shorthost.test.ex +cached data found but out-of-date; database lookup required for a=shorthost.test.ex dnsdb key: shorthost.test.ex lookup yielded: 127.0.0.1 LOG: MAIN diff --git a/test/stderr/2610 b/test/stderr/2610 index 951ddecff..b8eda8542 100644 --- a/test/stderr/2610 +++ b/test/stderr/2610 @@ -264,7 +264,7 @@ check set acl_m0 = ok: ${lookup mysql {select name from the LRU list: internal_search_find: file="NULL" type=mysql key="select name from them where id = 'c'" opts="servers=127.0.0.1::1223/test/root/" - cached data found but either wrong opts or dated; database lookup required for select name from them where id = 'c' + cached data found but wrong opts; database lookup required for select name from them where id = 'c' MySQL query: "select name from them where id = 'c'" opts 'servers=127.0.0.1::1223/test/root/' MYSQL using cached connection for 127.0.0.1:1223/test/root MYSQL: no data found @@ -278,7 +278,7 @@ check set acl_m0 = ok: ${lookup mysql,servers=127.0.0.1::1223/test/root/ LRU list: internal_search_find: file="NULL" type=mysql key="select name from them where id = 'c'" opts="servers=127.0.0.1::1223" - cached data found but either wrong opts or dated; database lookup required for select name from them where id = 'c' + cached data found but wrong opts; database lookup required for select name from them where id = 'c' MySQL query: "select name from them where id = 'c'" opts 'servers=127.0.0.1::1223' MYSQL using cached connection for 127.0.0.1:1223/test/root MYSQL: no data found diff --git a/test/stderr/2620 b/test/stderr/2620 index 337d51850..2c378284b 100644 --- a/test/stderr/2620 +++ b/test/stderr/2620 @@ -254,7 +254,7 @@ check set acl_m0 = ok: ${lookup pgsql {select name from the LRU list: internal_search_find: file="NULL" type=pgsql key="select name from them where id = 'c'" opts="servers=SSPEC" - cached data found but either wrong opts or dated; database lookup required for select name from them where id = 'c' + cached data found but wrong opts; database lookup required for select name from them where id = 'c' PostgreSQL query: "select name from them where id = 'c'" opts 'servers=SSPEC' lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers warn: condition test deferred in ACL "check_recipient" @@ -361,7 +361,7 @@ check set acl_m0 = ok: ${lookup pgsql {select name from the LRU list: internal_search_find: file="NULL" type=pgsql key="select name from them where id = 'c'" opts="servers=SSPEC" - cached data found but either wrong opts or dated; database lookup required for select name from them where id = 'c' + cached data found but wrong opts; database lookup required for select name from them where id = 'c' PostgreSQL query: "select name from them where id = 'c'" opts 'servers=SSPEC' lookup deferred: PostgreSQL server "SSPEC" not found in pgsql_servers warn: condition test deferred in ACL "check_recipient" -- cgit v1.2.3