Gitweb:
https://git.exim.org/exim.git/commitdiff/340e5f5781abb5388c41fa326d6e1cabf7ba96ff
Commit: 340e5f5781abb5388c41fa326d6e1cabf7ba96ff
Parent: 212c50c3b5dcdf00442933496a44b1d1db6908b5
Author: Jeremy Harris <jgh146exb@???>
AuthorDate: Tue Nov 29 15:02:01 2022 +0000
Committer: Jeremy Harris <jgh146exb@???>
CommitDate: Tue Nov 29 16:03:34 2022 +0000
Tweak debug output
---
src/src/retry.c | 2 +-
test/stderr/0143 | 2 +-
test/stderr/0357 | 6 +++---
test/stderr/0358 | 4 ++--
test/stderr/0388 | 4 ++--
test/stderr/0450 | 4 ++--
test/stderr/0476 | 6 +++---
test/stderr/0512 | 12 ++++++------
test/stderr/0554 | 4 ++--
test/stderr/0623 | 6 +++---
test/stderr/0631 | 1 +
test/stderr/0911 | 10 +++++-----
test/stderr/2035 | 2 +-
test/stderr/2135 | 2 +-
test/stderr/4052 | 2 +-
15 files changed, 34 insertions(+), 33 deletions(-)
diff --git a/src/src/retry.c b/src/src/retry.c
index f073af665..a34bf80ca 100644
--- a/src/src/retry.c
+++ b/src/src/retry.c
@@ -135,7 +135,7 @@ dbdata_retry * host_retry_record, * message_retry_record;
*retry_host_key = *retry_message_key = NULL;
-DEBUG(D_transport|D_retry) debug_printf("checking status of %s\n", host->name);
+DEBUG(D_transport|D_retry) debug_printf("checking retry status of %s\n", host->name);
/* Do nothing if status already set; otherwise initialize status as usable. */
diff --git a/test/stderr/0143 b/test/stderr/0143
index 395e32f9d..158e97d53 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -17,7 +17,7 @@ my_smtp transport entered
userx@???
hostlist:
'127.0.0.1' IP 127.0.0.1 port -1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ... connected
diff --git a/test/stderr/0357 b/test/stderr/0357
index 609b32612..c07db78d6 100644
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -22,7 +22,7 @@ After routing:
userx@???
Failed addresses:
Deferred addresses:
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
@@ -66,7 +66,7 @@ After routing:
userx@???
Failed addresses:
Deferred addresses:
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no host retry record
no message retry record
@@ -124,7 +124,7 @@ After routing:
userx@???
Failed addresses:
Deferred addresses:
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no host retry record
no message retry record
diff --git a/test/stderr/0358 b/test/stderr/0358
index 6e1e2bd1f..ea889aad7 100644
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -27,7 +27,7 @@ After routing:
usery@???
Failed addresses:
Deferred addresses:
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
@@ -90,7 +90,7 @@ After routing:
usery@???
Failed addresses:
Deferred addresses:
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no host retry record
no message retry record
diff --git a/test/stderr/0388 b/test/stderr/0388
index ac9dc436a..4bc2404b5 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -72,7 +72,7 @@ search_tidyup called
changed uid/gid: remote delivery to x@y with transport=smtp
uid=EXIM_UID gid=EXIM_GID pid=p1235
set_process_info: pppp delivering 10HmaX-0005vi-00 using smtp
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
@@ -111,7 +111,7 @@ address match test: subject=*@127.0.0.1 pattern=*
127.0.0.1 in "*"? yes (matched "*")
*@127.0.0.1 in "*"? yes (matched "*")
Clearing TFO as not first host for message
-checking status of V4NET.0.0.0
+checking retry status of V4NET.0.0.0
locking TESTSUITE/spool/db/retry.lockfile
locked TESTSUITE/spool/db/retry.lockfile
EXIM_DBOPEN: file <TESTSUITE/spool/db/retry> dir <TESTSUITE/spool/db> flags=O_RDONLY
diff --git a/test/stderr/0450 b/test/stderr/0450
index e502012d8..5c12aa414 100644
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -15,7 +15,7 @@ t1 transport entered
userx@???
using the transport's hosts: 127.0.0.1
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... failed: Connection refused
@@ -42,7 +42,7 @@ t1 transport entered
userx@???
using the transport's hosts: 127.0.0.1
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no host retry record
no message retry record
127.0.0.1 [127.0.0.1]:1112 retry-status = usable
diff --git a/test/stderr/0476 b/test/stderr/0476
index ce5143458..ebfed87b4 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -14,7 +14,7 @@ t1 transport entered
userx@???
hostlist:
'127.0.0.1' IP 127.0.0.1 port -1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (userx@???)
@@ -81,7 +81,7 @@ t1 transport entered
CALLER@???
hostlist:
'127.0.0.1' IP 127.0.0.1 port -1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@???)
set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (CALLER@???)
@@ -116,7 +116,7 @@ t1 transport entered
usery@???
hostlist:
'127.0.0.1' IP 127.0.0.1 port -1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = unusable
all IP addresses skipped or deferred at least one address
diff --git a/test/stderr/0512 b/test/stderr/0512
index 630242d13..95249213a 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -10,7 +10,7 @@ t1 transport entered
userx@???
using the transport's hosts: 127.0.0.1 : 127.0.0.1 : 127.0.0.1 : 127.0.0.1
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
@@ -22,7 +22,7 @@ added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flag
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
Clearing TFO as not first host for message
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
@@ -34,7 +34,7 @@ added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flag
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
Clearing TFO as not first host for message
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
@@ -46,7 +46,7 @@ added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flag
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
Clearing TFO as not first host for message
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
@@ -101,7 +101,7 @@ t1 transport entered
userx@???
using the transport's hosts: 127.0.0.1 : 127.0.0.1 : 127.0.0.1 : 127.0.0.1
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
@@ -113,7 +113,7 @@ added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flag
temporary delivery error(s) override hosts_max_try (message older than host's retry time)
Clearing TFO as not first host for message
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@???)
diff --git a/test/stderr/0554 b/test/stderr/0554
index 66e995e2e..2816f0baf 100644
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -15,7 +15,7 @@ After routing:
x@y
Failed addresses:
Deferred addresses:
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
added retry item for R:x@y:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
@@ -56,7 +56,7 @@ After routing:
x@y
Failed addresses:
Deferred addresses:
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no host retry record
no message retry record
diff --git a/test/stderr/0623 b/test/stderr/0623
index 9c76ebb6e..32d19297f 100644
--- a/test/stderr/0623
+++ b/test/stderr/0623
@@ -14,7 +14,7 @@ send_to_server transport entered
tempreject@???
using the transport's hosts: 127.0.0.1
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (tempreject@???)
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
@@ -78,7 +78,7 @@ send_to_server transport entered
permreject@???
using the transport's hosts: 127.0.0.1
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no host retry record
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
@@ -144,7 +144,7 @@ send_to_server transport entered
permreject@???
using the transport's hosts: 127.0.0.1
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no host retry record
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
diff --git a/test/stderr/0631 b/test/stderr/0631
index 967600d79..40a39d277 100644
--- a/test/stderr/0631
+++ b/test/stderr/0631
@@ -11,5 +11,6 @@ end of ACL "chk_rcpt": ACCEPT
using ACL "chk_data"
processing "accept" (TESTSUITE/test-config 30)
check control = debug/stop
+debug terminated by stop
******** SERVER ********
diff --git a/test/stderr/0911 b/test/stderr/0911
index 5bd87540c..63b3037a7 100644
--- a/test/stderr/0911
+++ b/test/stderr/0911
@@ -18,7 +18,7 @@ send_to_server transport entered
good@???
using the transport's hosts: 127.0.0.1
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (good@???)
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
@@ -84,7 +84,7 @@ send_to_server transport entered
nopipe@???
using the transport's hosts: 127.0.0.1
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaY-0005vi-00 to 127.0.0.1 [127.0.0.1] (nopipe@???)
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
@@ -149,7 +149,7 @@ send_to_server transport entered
tempreject@???
using the transport's hosts: 127.0.0.1
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (tempreject@???)
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
@@ -217,7 +217,7 @@ send_to_server transport entered
permreject@???
using the transport's hosts: 127.0.0.1
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no host retry record
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
@@ -287,7 +287,7 @@ send_to_server transport entered
dataloss@???
using the transport's hosts: 127.0.0.1
getting address for 127.0.0.1
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no host retry record
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
diff --git a/test/stderr/2035 b/test/stderr/2035
index 3888badbb..a0e5f374c 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -49,7 +49,7 @@ t1 transport entered
hostlist:
'127.0.0.1' IP 127.0.0.1 port PORT_D
already connected to 127.0.0.1 [127.0.0.1] (on fd 0)
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userb@???)
continued connection, proxied TLS
diff --git a/test/stderr/2135 b/test/stderr/2135
index 3888badbb..a0e5f374c 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -49,7 +49,7 @@ t1 transport entered
hostlist:
'127.0.0.1' IP 127.0.0.1 port PORT_D
already connected to 127.0.0.1 [127.0.0.1] (on fd 0)
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userb@???)
continued connection, proxied TLS
diff --git a/test/stderr/4052 b/test/stderr/4052
index c8a0c69be..b3264387d 100644
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -14,7 +14,7 @@ smtp transport entered
extchange@???
hostlist:
'127.0.0.1' IP 127.0.0.1 port PORT_D
-checking status of 127.0.0.1
+checking retry status of 127.0.0.1
no host retry record
no message retry record
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
