X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/73141a5abf8a3699249e401522fe9174b5aa8a1b..340e5f5781abb5388c41fa326d6e1cabf7ba96ff:/test/stderr/0476 diff --git a/test/stderr/0476 b/test/stderr/0476 index 52fe40ae8..ebfed87b4 100644 --- a/test/stderr/0476 +++ b/test/stderr/0476 @@ -4,9 +4,9 @@ admin user dropping to exim gid; retaining priv uid set_process_info: pppp running the queue (single queue run) LOG: queue_run MAIN - Start queue run: pid=pppp + Start queue run: pid=p1234 set_process_info: pppp running queue: 10HmaX-0005vi-00-H -set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid pppp) +set_process_info: pppp delivering 10HmaX-0005vi-00 (queue run pid p1234) >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> userx@test.ex <-------- set_process_info: pppp delivering 10HmaX-0005vi-00 using t1 @@ -14,11 +14,11 @@ t1 transport entered userx@test.ex hostlist: '127.0.0.1' IP 127.0.0.1 port -1 -checking status of 127.0.0.1 +checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@test.ex) set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (userx@test.ex) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... connected SMTP<< 220 Server ready SMTP>> EHLO the.local.host.name cmd buf flush ddd bytes @@ -27,8 +27,8 @@ cmd buf flush ddd bytes 250 OK using PIPELINING not using DSN - SMTP>> MAIL FROM: - SMTP>> RCPT TO: + SMTP|> MAIL FROM: + SMTP|> RCPT TO: SMTP>> DATA cmd buf flush ddd bytes sync_responses expect mail @@ -48,6 +48,7 @@ cmd buf flush ddd bytes SMTP(closed)<< H=127.0.0.1 [127.0.0.1] Remote host closed connection in response to RSET SMTP(close)>> +cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:550:RSET' set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for userx@test.ex: result OK Leaving t1 transport set_process_info: pppp delivering 10HmaX-0005vi-00 (just run t1 for userx@test.ex in subprocess) @@ -80,18 +81,18 @@ t1 transport entered CALLER@the.local.host.name hostlist: '127.0.0.1' IP 127.0.0.1 port -1 -checking status of 127.0.0.1 +checking retry status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 retry-status = usable delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name) set_process_info: pppp delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (CALLER@the.local.host.name) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... failed: Connection refused +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... failed: Connection refused LOG: MAIN H=127.0.0.1 [127.0.0.1] Connection refused set_process_info: pppp delivering 10HmaZ-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for CALLER@the.local.host.name: result DEFER -added retry item for T:127.0.0.1:127.0.0.1:1224: errno=dd more_errno=dd,A flags=2 +added retry item for T:127.0.0.1:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2 all IP addresses skipped or deferred at least one address updating wait-t1 database -added to list for 127.0.0.1 +added 10HmaZ-0005vi-00 to queue for 127.0.0.1 Leaving t1 transport set_process_info: pppp delivering 10HmaZ-0005vi-00 (just run t1 for CALLER@the.local.host.name in subprocess) set_process_info: pppp delivering 10HmaZ-0005vi-00: waiting for a remote delivery subprocess to finish @@ -99,15 +100,15 @@ set_process_info: pppp delivering 10HmaZ-0005vi-00 LOG: MAIN == CALLER@the.local.host.name R=r1 T=t1 defer (dd): Connection refused set_process_info: pppp tidying up after delivering 10HmaZ-0005vi-00 ->>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1236 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1235 (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN Completed ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> set_process_info: pppp running queue: waiting for children of pppp set_process_info: pppp running queue set_process_info: pppp running queue: 10HmaY-0005vi-00-H -set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid pppp) +set_process_info: pppp delivering 10HmaY-0005vi-00 (queue run pid p1234) >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> --------> usery@test.ex <-------- set_process_info: pppp delivering 10HmaY-0005vi-00 using t1 @@ -115,12 +116,12 @@ t1 transport entered usery@test.ex hostlist: '127.0.0.1' IP 127.0.0.1 port -1 -checking status of 127.0.0.1 +checking retry status of 127.0.0.1 no message retry record 127.0.0.1 [127.0.0.1]:1111 retry-status = unusable all IP addresses skipped or deferred at least one address updating wait-t1 database -added to list for 127.0.0.1 +added 10HmaY-0005vi-00 to queue for 127.0.0.1 Leaving t1 transport set_process_info: pppp delivering 10HmaY-0005vi-00 (just run t1 for usery@test.ex in subprocess) set_process_info: pppp running queue: waiting for 10HmaY-0005vi-00 (pppp) @@ -129,9 +130,9 @@ set_process_info: pppp delivering 10HmaY-0005vi-00 LOG: retry_defer MAIN == usery@test.ex R=r1 T=t1 defer (-54): retry time not reached for any host for 'test.ex' set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 ->>>>>>>>>>>>>>>> Exim pid=pppp (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1238 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> set_process_info: pppp running queue: waiting for children of pppp set_process_info: pppp running queue LOG: queue_run MAIN - End queue run: pid=pppp ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + End queue run: pid=p1234 +>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>