From c562fd30c03126dd72d76ec43842d9d00fcd8bf3 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Thu, 25 Sep 2014 22:20:33 +0100 Subject: More regular logging use of H= [] Note this may affect utilities which parse logs. --- test/msglog/0099.10HmaX-0005vi-00 | 4 ++-- test/msglog/0106.10HmaX-0005vi-00 | 4 ++-- test/msglog/0106.10HmaY-0005vi-00 | 4 ++-- test/msglog/0109.10HmaX-0005vi-00 | 4 ++-- test/msglog/0197.10HmaX-0005vi-00 | 4 ++-- test/msglog/0197.10HmaY-0005vi-00 | 2 +- test/msglog/0198.10HmaX-0005vi-00 | 2 +- test/msglog/0208.10HmaX-0005vi-00 | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'test/msglog') diff --git a/test/msglog/0099.10HmaX-0005vi-00 b/test/msglog/0099.10HmaX-0005vi-00 index 996dc858c..f9bd430c0 100644 --- a/test/msglog/0099.10HmaX-0005vi-00 +++ b/test/msglog/0099.10HmaX-0005vi-00 @@ -1,5 +1,5 @@ 1999-03-02 09:44:33 Received from CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 127.0.0.1 [127.0.0.1] Connection refused +1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 userx@far.away.ex R=all T=smtp defer (dd): Connection refused -1999-03-02 09:44:33 127.0.0.1 [127.0.0.1] Connection refused +1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1] Connection refused 1999-03-02 09:44:33 userx@far.away.ex R=all T=smtp defer (dd): Connection refused diff --git a/test/msglog/0106.10HmaX-0005vi-00 b/test/msglog/0106.10HmaX-0005vi-00 index 0ae4aaa9d..4d612288b 100644 --- a/test/msglog/0106.10HmaX-0005vi-00 +++ b/test/msglog/0106.10HmaX-0005vi-00 @@ -1,3 +1,3 @@ 1999-03-02 09:44:33 Received from CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after EHLO myhost.test.ex: Connection timed out -1999-03-02 09:44:33 userx@domain1.com R=all T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after EHLO myhost.test.ex +1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1]: SMTP timeout after EHLO myhost.test.ex: Connection timed out +1999-03-02 09:44:33 userx@domain1.com R=all T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after EHLO myhost.test.ex diff --git a/test/msglog/0106.10HmaY-0005vi-00 b/test/msglog/0106.10HmaY-0005vi-00 index 4c4f9b061..af0eb72c0 100644 --- a/test/msglog/0106.10HmaY-0005vi-00 +++ b/test/msglog/0106.10HmaY-0005vi-00 @@ -1,3 +1,3 @@ 1999-03-02 09:44:33 Received from CALLER@myhost.test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM:: Connection timed out -1999-03-02 09:44:33 userx@domain2.com R=all T=smtp defer (dd): Connection timed out: SMTP timeout while connected to 127.0.0.1 [127.0.0.1] after MAIL FROM: +1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1] SMTP timeout after MAIL FROM:: Connection timed out +1999-03-02 09:44:33 userx@domain2.com R=all T=smtp defer (dd): Connection timed out H=127.0.0.1 [127.0.0.1]: SMTP timeout after MAIL FROM: diff --git a/test/msglog/0109.10HmaX-0005vi-00 b/test/msglog/0109.10HmaX-0005vi-00 index 573dae326..842e692b4 100644 --- a/test/msglog/0109.10HmaX-0005vi-00 +++ b/test/msglog/0109.10HmaX-0005vi-00 @@ -1,4 +1,4 @@ 1999-03-02 09:44:33 Received from CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 127.0.0.1 [127.0.0.1] Connection refused -1999-03-02 09:44:33 ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused +1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1] Connection refused +1999-03-02 09:44:33 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4] Connection refused 1999-03-02 09:44:33 xx@non-exist.test.ex R=remote T=smtp defer (dd): Connection refused diff --git a/test/msglog/0197.10HmaX-0005vi-00 b/test/msglog/0197.10HmaX-0005vi-00 index 5fb436cf6..51efc6228 100644 --- a/test/msglog/0197.10HmaX-0005vi-00 +++ b/test/msglog/0197.10HmaX-0005vi-00 @@ -1,9 +1,9 @@ 1999-03-02 09:44:33 Received from CALLER@the.local.host.name U=CALLER P=local S=sss 1999-03-02 09:44:33 userx@copy.domain : makecopy transport succeeded 1999-03-02 09:44:33 usery@copy.domain : makecopy transport succeeded -1999-03-02 09:44:33 V4NET.0.0.1 [V4NET.0.0.1] Network Error +1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 userx@copy.domain R=passall T=pass_on defer (dd): Network Error 1999-03-02 09:44:33 usery@copy.domain R=passall T=pass_on defer (dd): Network Error -1999-03-02 09:44:33 V4NET.0.0.1 [V4NET.0.0.1] Network Error +1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 userx@copy.domain R=passall T=pass_on defer (dd): Network Error 1999-03-02 09:44:33 usery@copy.domain R=passall T=pass_on defer (dd): Network Error diff --git a/test/msglog/0197.10HmaY-0005vi-00 b/test/msglog/0197.10HmaY-0005vi-00 index 9ca30818e..a046fcdba 100644 --- a/test/msglog/0197.10HmaY-0005vi-00 +++ b/test/msglog/0197.10HmaY-0005vi-00 @@ -4,7 +4,7 @@ 1999-03-02 09:44:33 x@copy.domain R=passall T=pass_on defer (-53): retry time not reached for any host 1999-03-02 09:44:33 y@copy.domain R=passall T=pass_on defer (-53): retry time not reached for any host 1999-03-02 09:44:33 z@elsewhere R=passall T=pass_on defer (-53): retry time not reached for any host -1999-03-02 09:44:33 V4NET.0.0.1 [V4NET.0.0.1] Network Error +1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 x@copy.domain R=passall T=pass_on defer (dd): Network Error 1999-03-02 09:44:33 y@copy.domain R=passall T=pass_on defer (dd): Network Error 1999-03-02 09:44:33 z@elsewhere R=passall T=pass_on defer (dd): Network Error diff --git a/test/msglog/0198.10HmaX-0005vi-00 b/test/msglog/0198.10HmaX-0005vi-00 index 61ba18aae..858bd1826 100644 --- a/test/msglog/0198.10HmaX-0005vi-00 +++ b/test/msglog/0198.10HmaX-0005vi-00 @@ -1,4 +1,4 @@ 1999-03-02 09:44:33 Received from CALLER@the.local.host.name U=CALLER P=local-bsmtp S=sss id=E10HmaY-0005vi-00@the.local.host.name 1999-03-02 09:44:33 routing failed for usery@copy.domain: Unrouteable address -1999-03-02 09:44:33 V4NET.0.0.1 [V4NET.0.0.1] Network Error +1999-03-02 09:44:33 H=V4NET.0.0.1 [V4NET.0.0.1] Network Error 1999-03-02 09:44:33 userx@copy.domain R=check_file T=pass_on defer (dd): Network Error diff --git a/test/msglog/0208.10HmaX-0005vi-00 b/test/msglog/0208.10HmaX-0005vi-00 index 530806ba8..3ac99ebd0 100644 --- a/test/msglog/0208.10HmaX-0005vi-00 +++ b/test/msglog/0208.10HmaX-0005vi-00 @@ -3,5 +3,5 @@ 1999-03-02 09:44:33 routing failed for fail.direct@test.ex: Unrouteable address 1999-03-02 09:44:33 defer@test.ex R=defer defer (-1): don't do this yet 1999-03-02 09:44:33 ok@test.ex: succeed transport succeeded -1999-03-02 09:44:33 SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused -1999-03-02 09:44:33 fail.transport@test.ex R=fail_transport T=fail: SMTP error from remote mail server after RCPT TO:: host 127.0.0.1 [127.0.0.1]: 550 Recipient refused +1999-03-02 09:44:33 H=127.0.0.1 [127.0.0.1] SMTP error from remote mail server after RCPT TO:: 550 Recipient refused +1999-03-02 09:44:33 fail.transport@test.ex R=fail_transport T=fail H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 550 Recipient refused -- cgit v1.2.3