X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/48c7f9e2e3b50cd5548447de62c77c7ddfe21519..a466d09b249d5018ecb0f1ec45adba545c02c75b:/test/stderr/0357?ds=sidebyside diff --git a/test/stderr/0357 b/test/stderr/0357 index cae10d04f..6073e8c62 100644 --- a/test/stderr/0357 +++ b/test/stderr/0357 @@ -28,7 +28,7 @@ added retry item for R:userx@test.ex:: errno=-44 more_errno=dd,A reading retry information for R:userx@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:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error Processing retry items Succeeded addresses: Failed addresses: @@ -39,7 +39,7 @@ retry for R:userx@test.ex: = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:userx@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:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error end of retry processing >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> @@ -52,6 +52,7 @@ locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex no domain retry record +added retry item for R:userx@test.ex:: errno=-1 more_errno=dd flags=1 added retry item for R:userx@test.ex: errno=-1 more_errno=dd flags=1 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -67,6 +68,7 @@ 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 reading retry information for R:test.ex from subprocess existing delete item dropped @@ -74,8 +76,10 @@ reading retry information for R:test.ex from subprocess reading retry information for R:userx@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 LOG: MAIN - == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error Processing retry items Succeeded addresses: Failed addresses: @@ -88,7 +92,7 @@ retry for R:userx@test.ex: = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:userx@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:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error end of retry processing LOG: queue_run MAIN End queue run: pid=pppp @@ -102,6 +106,7 @@ locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex no domain retry record +added retry item for R:userx@test.ex:: errno=-1 more_errno=dd flags=1 added retry item for R:userx@test.ex: errno=-1 more_errno=dd flags=1 added retry item for R:test.ex: errno=-1 more_errno=dd flags=1 >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> @@ -117,6 +122,7 @@ 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 reading retry information for R:test.ex from subprocess existing delete item dropped @@ -124,8 +130,10 @@ reading retry information for R:test.ex from subprocess reading retry information for R:userx@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 LOG: MAIN - == userx@test.ex R=r1 T=t1 defer (-44): SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + == userx@test.ex R=r1 T=t1 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error Processing retry items Succeeded addresses: Failed addresses: @@ -138,7 +146,7 @@ retry for R:userx@test.ex: = * 0 0 failing_interval=ttt message_age=ttt Writing retry data for R:userx@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:: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error end of retry processing LOG: queue_run MAIN End queue run: pid=pppp @@ -152,6 +160,9 @@ locking TESTSUITE/spool/db/retry.lockfile >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userx@test.ex no domain retry record +retry time not reached: checking ultimate address timeout + now=tttt first_failed=tttt next_try=tttt expired=0 + received_time=tttt diff=tttt timeout=3600 LOG: retry_defer MAIN == userx@test.ex routing defer (-51): retry time not reached >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>