ph10 2006/07/03 16:39:06 BST
Modified files:
exim-doc/doc-txt ChangeLog
exim-src/src retry.c
exim-test runtest
exim-test/stderr 0476
Log:
More debugging information given for retry time not reached.
Revision Changes Path
1.367 +2 -0 exim/exim-doc/doc-txt/ChangeLog
1.11 +13 -3 exim/exim-src/src/retry.c
1.11 +2 -1 exim/exim-test/runtest
1.4 +2 -1 exim/exim-test/stderr/0476
Index: ChangeLog
===================================================================
RCS file: /home/cvs/exim/exim-doc/doc-txt/ChangeLog,v
retrieving revision 1.366
retrieving revision 1.367
diff -u -r1.366 -r1.367
--- ChangeLog 3 Jul 2006 15:19:44 -0000 1.366
+++ ChangeLog 3 Jul 2006 15:39:06 -0000 1.367
@@ -1,4 +1,4 @@
-$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.366 2006/07/03 15:19:44 ph10 Exp $
+$Cambridge: exim/exim-doc/doc-txt/ChangeLog,v 1.367 2006/07/03 15:39:06 ph10 Exp $
Change log file for Exim from version 4.21
-------------------------------------------
@@ -69,6 +69,8 @@
PH/09 Applied patch from Erik to use select() instead of poll() in spam.c on
systems where poll() doesn't work, in particular OS X.
+
+PH/10 Added more information to debugging output for retry time not reached.
Exim version 4.62
Index: retry.c
===================================================================
RCS file: /home/cvs/exim/exim-src/src/retry.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- retry.c 20 Apr 2006 10:57:46 -0000 1.10
+++ retry.c 3 Jul 2006 15:39:06 -0000 1.11
@@ -1,4 +1,4 @@
-/* $Cambridge: exim/exim-src/src/retry.c,v 1.10 2006/04/20 10:57:46 ph10 Exp $ */
+/* $Cambridge: exim/exim-src/src/retry.c,v 1.11 2006/07/03 15:39:06 ph10 Exp $ */
/*************************************************
* Exim - an Internet mail transport agent *
@@ -47,9 +47,8 @@
last_rule->next != NULL;
last_rule = last_rule->next);
DEBUG(D_transport|D_retry)
- debug_printf("now=%d received_time=%d diff=%d timeout=%d\n",
- (int)now, received_time, (int)(now - received_time),
- last_rule->timeout);
+ debug_printf(" received_time=%d diff=%d timeout=%d\n",
+ received_time, (int)(now - received_time), last_rule->timeout);
address_timeout = (now - received_time > last_rule->timeout);
}
else
@@ -210,8 +209,14 @@
if (now < host_retry_record->next_try && !deliver_force)
{
DEBUG(D_transport|D_retry)
+ {
debug_printf("host retry time not reached: checking ultimate address "
"timeout\n");
+ debug_printf(" now=%d first_failed=%d next_try=%d expired=%d\n",
+ (int)now, (int)host_retry_record->first_failed,
+ (int)host_retry_record->next_try,
+ host_retry_record->expired);
+ }
if (!host_retry_record->expired &&
ultimate_address_timeout(host_key, domain,
@@ -247,8 +252,13 @@
if (now < message_retry_record->next_try && !deliver_force)
{
DEBUG(D_transport|D_retry)
+ {
debug_printf("host+message retry time not reached: checking ultimate "
"address timeout\n");
+ debug_printf(" now=%d first_failed=%d next_try=%d expired=%d\n",
+ (int)now, (int)message_retry_record->first_failed,
+ (int)message_retry_record->next_try, message_retry_record->expired);
+ }
if (!ultimate_address_timeout(host_key, domain, 0, 0, now))
{
host->status = hstatus_unusable;
Index: runtest
===================================================================
RCS file: /home/cvs/exim/exim-test/runtest,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- runtest 28 Apr 2006 13:46:36 -0000 1.10
+++ runtest 3 Jul 2006 15:39:06 -0000 1.11
@@ -1,6 +1,6 @@
#! /usr/bin/perl -w
-# $Cambridge: exim/exim-test/runtest,v 1.10 2006/04/28 13:46:36 ph10 Exp $
+# $Cambridge: exim/exim-test/runtest,v 1.11 2006/07/03 15:39:06 ph10 Exp $
###############################################################################
# This is the controlling script for the "new" test suite for Exim. It should #
@@ -413,7 +413,8 @@
my($next) = $3 - $2;
$_ = " first failed=dddd last try=dddd next try=+$next $4\n";
}
- s/^now=\d+ received_time=\d+ diff=\d+ timeout=(\d+)/now=tttt received_time=tttt diff=tttt timeout=$1/;
+ s/^(\s*)now=\d+ first_failed=\d+ next_try=\d+ expired=(\d)/$1now=tttt first_failed=tttt next_try=tttt expired=$2/;
+ s/^(\s*)received_time=\d+ diff=\d+ timeout=(\d+)/$1now=tttt received_time=tttt diff=tttt timeout=$2/;
# Time to retry may vary
s/time to retry = \S+/time to retry = tttt/;
Index: 0476
===================================================================
RCS file: /home/cvs/exim/exim-test/stderr/0476,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 0476 16 Feb 2006 10:05:34 -0000 1.3
+++ 0476 3 Jul 2006 15:39:06 -0000 1.4
@@ -96,7 +96,8 @@
checking status of 127.0.0.1
no message retry record
host retry time not reached: checking ultimate address timeout
-now=tttt received_time=tttt diff=tttt timeout=86400
+ now=tttt first_failed=tttt next_try=tttt expired=0
+ now=tttt received_time=tttt diff=tttt timeout=86400
127.0.0.1 [127.0.0.1]:1111 status = unusable
all IP addresses skipped or deferred at least one address
Leaving t1 transport
