diff options
author | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-11-06 15:50:12 +0000 |
---|---|---|
committer | Philip Hazel <ph10@hermes.cam.ac.uk> | 2006-11-06 15:50:12 +0000 |
commit | 48c7f9e2e3b50cd5548447de62c77c7ddfe21519 (patch) | |
tree | 588f2c5e5885f5e9f67d5faba9045a0c76f84cb5 /test/stderr/0357 | |
parent | 520de300979cb6cf448cd23f729dd39368202a16 (diff) |
Include sender address in retry key for 4xx errors.
Diffstat (limited to 'test/stderr/0357')
-rw-r--r-- | test/stderr/0357 | 61 |
1 files changed, 45 insertions, 16 deletions
diff --git a/test/stderr/0357 b/test/stderr/0357 index 7a6ee4d3b..cae10d04f 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -24,8 +24,8 @@ After routing: checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no retry data available -added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0 -reading retry information for R:userx@test.ex from subprocess +added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0 +reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess added retry item LOG: MAIN == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error @@ -35,9 +35,9 @@ Failed addresses: Deferred addresses: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile -retry for R:userx@test.ex = * 0 0 +retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0 failing_interval=ttt message_age=ttt -Writing retry data for R:userx@test.ex +Writing retry data for R:userx@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+1 expired=0 errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error end of retry processing @@ -65,15 +65,15 @@ checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no host retry record no message retry record -added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0 -reading retry information for R:userx@test.ex from subprocess - existing delete item dropped +added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0 +reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess added retry item reading retry information for R:test.ex from subprocess existing delete item dropped added delete item reading retry information for R:userx@test.ex from subprocess - delete item not added: non-delete item exists + existing delete item dropped + added delete item LOG: MAIN == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error Processing retry items @@ -82,10 +82,11 @@ Failed addresses: Deferred addresses: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile +deleted retry information for R:userx@test.ex deleted retry information for R:test.ex -retry for R:userx@test.ex = * 0 0 +retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0 failing_interval=ttt message_age=ttt -Writing retry data for R:userx@test.ex +Writing retry data for R:userx@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+1 expired=0 errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error end of retry processing @@ -114,15 +115,15 @@ checking status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile no host retry record no message retry record -added retry item for R:userx@test.ex: errno=-44 more_errno=dd,A flags=0 -reading retry information for R:userx@test.ex from subprocess - existing delete item dropped +added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0 +reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess added retry item reading retry information for R:test.ex from subprocess existing delete item dropped added delete item reading retry information for R:userx@test.ex from subprocess - delete item not added: non-delete item exists + existing delete item dropped + added delete item LOG: MAIN == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error Processing retry items @@ -131,13 +132,41 @@ Failed addresses: Deferred addresses: userx@test.ex locking TESTSUITE/spool/db/retry.lockfile +deleted retry information for R:userx@test.ex deleted retry information for R:test.ex -retry for R:userx@test.ex = * 0 0 +retry for R:userx@test.ex:<CALLER@test.ex> = * 0 0 failing_interval=ttt message_age=ttt -Writing retry data for R:userx@test.ex +Writing retry data for R:userx@test.ex:<CALLER@test.ex> first failed=dddd last try=dddd next try=+2 expired=0 errno=-44 more_errno=dd,A SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error end of retry processing LOG: queue_run MAIN End queue run: pid=pppp >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +admin user +LOG: queue_run MAIN + Start queue run: pid=pppp +locking TESTSUITE/spool/db/retry.lockfile +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +Considering: userx@test.ex +no domain retry record +LOG: retry_defer MAIN + == userx@test.ex routing defer (-51): retry time not reached +>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> +After routing: + Local deliveries: + Remote deliveries: + Failed addresses: + Deferred addresses: + userx@test.ex +Processing retry items +Succeeded addresses: +Failed addresses: +Deferred addresses: +userx@test.ex: no retry items +end of retry processing +LOG: queue_run MAIN + End queue run: pid=pppp +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> |