[exim-cvs] More debug in smtp transport

Gitweb: https://git.exim.org/exim.git/commitdiff/06f37c802cbe477b2db358a0e76388d2df84691f

Commit:     06f37c802cbe477b2db358a0e76388d2df84691f
Parent:     67ea939cf0873497e9b8aaa8e21163621cc869df
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Dec 2 00:29:41 2018 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Sun Dec 2 01:10:23 2018 +0000

    More debug in smtp transport
---
 src/src/transports/smtp.c | 11 +++++++++++
 test/stderr/0512          |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index eb596df..96d694f 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 0cbcfc2..738a720 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