From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 2 Dec 2018 00:29:41 +0000 (+0000)
Subject: More debug in smtp transport
X-Git-Url: https://git.exim.org/users/jgh/exim.git/commitdiff_plain/06f37c802cbe477b2db358a0e76388d2df84691f

More debug in smtp transport
---

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index eb596dfe6..96d694fcc 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -5298,6 +5298,17 @@ retry_non_continued:
           "hosts_max_try (message older than host's retry time)\n");
         }
       }
+
+    DEBUG(D_transport)
+      {
+      if (unexpired_hosts_tried >= ob->hosts_max_try)
+	debug_printf("reached transport hosts_max_try limit %d\n",
+	  ob->hosts_max_try);
+      if (total_hosts_tried >= ob->hosts_max_try_hardlimit)
+	debug_printf("reached transport hosts_max_try_hardlimit limit %d\n",
+	  ob->hosts_max_try_hardlimit);
+      }
+
     if (f.running_in_test_harness) millisleep(500); /* let server debug out */
     }   /* End of loop for trying multiple hosts. */
 
diff --git a/test/stderr/0512 b/test/stderr/0512
index 0cbcfc227..738a7204a 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -51,6 +51,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
+reached transport hosts_max_try limit 1
 all IP addresses skipped or deferred at least one address
 updating wait-t1 database
 already listed for 127.0.0.1
@@ -114,6 +115,7 @@ LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2
 temporary delivery error(s) override hosts_max_try (message older than host's retry time)
+reached transport hosts_max_try_hardlimit limit 2
 all IP addresses skipped or deferred at least one address
 hosts_max_try_hardlimit reached: behave as if all hosts were tried
 updating wait-t1 database