diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2018-12-02 00:29:41 +0000 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2018-12-02 01:10:23 +0000 |
| commit | 06f37c802cbe477b2db358a0e76388d2df84691f (patch) | |
| tree | ad0078128cd02ad4c736a9b4e0fdc84c120448cd | |
| parent | 67ea939cf0873497e9b8aaa8e21163621cc869df (diff) | |
| download | exim4-06f37c802cbe477b2db358a0e76388d2df84691f.tar.gz | |
More debug in smtp transport
| -rw-r--r-- | src/src/transports/smtp.c | 11 | ||||
| -rw-r--r-- | test/stderr/0512 | 2 |
2 files changed, 13 insertions, 0 deletions
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 |