diff options
| author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-07-04 09:07:20 +0000 |
|---|---|---|
| committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-07-04 09:07:20 +0000 |
| commit | 148e1ac6c5645e53f4f80eeb4978565b5ca4233b (patch) | |
| tree | 2e13468b51f66db9fe45c7a0579f6d50aa1f41f4 /src | |
| parent | 5d00f5469eeea6c1f1fcfbce61bb84f4b7b6a41d (diff) | |
Missed one case of "retry time not reached" when adding additional
debugging information.
Diffstat (limited to 'src')
| -rw-r--r-- | src/src/deliver.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/src/deliver.c b/src/src/deliver.c index d4051768e..fdff07414 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -1,4 +1,4 @@ -/* $Cambridge: exim/src/src/deliver.c,v 1.34 2006/06/30 15:36:08 ph10 Exp $ */ +/* $Cambridge: exim/src/src/deliver.c,v 1.35 2006/07/04 09:07:20 ph10 Exp $ */ /************************************************* * Exim - an Internet mail transport agent * @@ -2328,8 +2328,13 @@ while (addr_local != NULL) retry_record->more_errno); DEBUG(D_deliver|D_retry) + { debug_printf("retry time not reached for %s: " "checking ultimate address timeout\n", addr2->address); + debug_printf(" now=%d first_failed=%d next_try=%d expired=%d\n", + (int)now, (int)retry_record->first_failed, + (int)retry_record->next_try, retry_record->expired); + } if (retry != NULL && retry->rules != NULL) { @@ -2338,9 +2343,8 @@ while (addr_local != NULL) last_rule->next != NULL; last_rule = last_rule->next); DEBUG(D_deliver|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); if (now - received_time > last_rule->timeout) ok = TRUE; } else |