diff options
author | Jeremy Harris <jgh146exb@wizmail.org> | 2014-09-25 22:20:33 +0100 |
---|---|---|
committer | Jeremy Harris <jgh146exb@wizmail.org> | 2014-10-22 16:14:25 +0100 |
commit | c562fd30c03126dd72d76ec43842d9d00fcd8bf3 (patch) | |
tree | 283acd3a5fb458ab95b860938d643fa8f011f6fc /test/stdout | |
parent | 6a7ed50f95285263f72f625f92ae3aa75edb7426 (diff) |
More regular logging use of H=<name> [<ip>]
Note this may affect utilities which parse logs.
Diffstat (limited to 'test/stdout')
-rw-r--r-- | test/stdout/0213 | 2 | ||||
-rw-r--r-- | test/stdout/0357 | 6 | ||||
-rw-r--r-- | test/stdout/0358 | 8 | ||||
-rw-r--r-- | test/stdout/0474 | 6 | ||||
-rw-r--r-- | test/stdout/0497 | 4 | ||||
-rw-r--r-- | test/stdout/0498 | 2 | ||||
-rw-r--r-- | test/stdout/0548 | 12 | ||||
-rw-r--r-- | test/stdout/0554 | 2 |
8 files changed, 21 insertions, 21 deletions
diff --git a/test/stdout/0213 b/test/stdout/0213 index 2d5a7602d..d3dd7cffc 100644 --- a/test/stdout/0213 +++ b/test/stdout/0213 @@ -1,5 +1,5 @@ +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224 -19 65 Malformed SMTP reply from 127.0.0.1 [127.0.0.1] in response to RCPT TO:<userx@domain1>: 550 The answer is no, but I am going to make sure it is a very + T:127.0.0.1:127.0.0.1:1224 -19 65 H=127.0.0.1 [127.0.0.1]: Malformed SMTP reply in response to RCPT TO:<userx@domain1>: 550 The answer is no, but I am going to make sure it is a very l first failed = time last try = time2 next try = time2 + 3600 ******** SERVER ******** diff --git a/test/stdout/0357 b/test/stdout/0357 index f7864bf4b..648513eab 100644 --- a/test/stdout/0357 +++ b/test/stdout/0357 @@ -1,11 +1,11 @@ +++++++++++++++++++++++++++ - R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error first failed = time last try = time2 next try = time2 + 1 +++++++++++++++++++++++++++ - R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error first failed = time last try = time2 next try = time2 + 1 +++++++++++++++++++++++++++ - R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error first failed = time last try = time2 next try = time2 + 2 ******** SERVER ******** diff --git a/test/stdout/0358 b/test/stdout/0358 index ab77a784e..80553ee2b 100644 --- a/test/stdout/0358 +++ b/test/stdout/0358 @@ -1,12 +1,12 @@ +++++++++++++++++++++++++++ - R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error first failed = time last try = time2 next try = time2 + 1 - R:usery@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:usery@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error first failed = time last try = time2 next try = time2 + 1 +++++++++++++++++++++++++++ - R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:userx@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Temporary error first failed = time last try = time2 next try = time2 + 2 - R:usery@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<usery@test.ex>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:usery@test.ex:<CALLER@test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<usery@test.ex>: 451 Temporary error first failed = time last try = time2 next try = time2 + 2 ******** SERVER ******** diff --git a/test/stdout/0474 b/test/stdout/0474 index ee42c1e32..f00a7d80b 100644 --- a/test/stdout/0474 +++ b/test/stdout/0474 @@ -1,11 +1,11 @@ +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after end of data: host 127.0.0.1 [127.0.0.1]: 850 NONSENSE + T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after end of data: 850 NONSENSE first failed = time last try = time2 next try = time2 + 10 +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH + T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 0 65 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@the.local.host.name>: 850 RUBBISH first failed = time last try = time2 next try = time2 + 10 +++++++++++++++++++++++++++ - R:abcd@xyz:<CALLER@the.local.host.name> -44 12865 SMTP error from remote mail server after RCPT TO:<abcd@xyz>: host 127.0.0.1 [127.0.0.1]: 850 RUBBISH + R:abcd@xyz:<CALLER@the.local.host.name> -44 12865 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<abcd@xyz>: 850 RUBBISH first failed = time last try = time2 next try = time2 + 10 ******** SERVER ******** diff --git a/test/stdout/0497 b/test/stdout/0497 index 3462fd1b3..e179e58a2 100644 --- a/test/stdout/0497 +++ b/test/stdout/0497 @@ -1,8 +1,8 @@ +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 13377 SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 452 temporary error + T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 13377 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 452 temporary error first failed = time last try = time2 next try = time2 + 0 * +++++++++++++++++++++++++++ - R:userx@x.y:<CALLER@myhost.test.ex> -44 13377 SMTP error from remote mail server after RCPT TO:<userx@x.y>: host 127.0.0.1 [127.0.0.1]: 452 temporary error + R:userx@x.y:<CALLER@myhost.test.ex> -44 13377 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@x.y>: 452 temporary error first failed = time last try = time2 next try = time2 + 0 * ******** SERVER ******** diff --git a/test/stdout/0498 b/test/stdout/0498 index f1448ba45..61a27bee9 100644 --- a/test/stdout/0498 +++ b/test/stdout/0498 @@ -1,5 +1,5 @@ +++++++++++++++++++++++++++ - T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 12865 SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: host 127.0.0.1 [127.0.0.1]: 450 DELAY + T:127.0.0.1:127.0.0.1:1224:10HmaX-0005vi-00 -45 12865 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after MAIL FROM:<CALLER@myhost.test.ex>: 450 DELAY first failed = time last try = time2 next try = time2 + 10 ******** SERVER ******** diff --git a/test/stdout/0548 b/test/stdout/0548 index b12491f7a..7f7d788b6 100644 --- a/test/stdout/0548 +++ b/test/stdout/0548 @@ -1,15 +1,15 @@ +++++++++++++++++++++++++++ - R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred + R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred first failed = time last try = time2 next try = time2 + 1 - T:thishost.test.ex:127.0.0.1:1225 0 65 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred + T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred first failed = time last try = time2 next try = time2 + 1 +++++++++++++++++++++++++++ - R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred + R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred first failed = time last try = time2 next try = time2 + 5 * - T:thishost.test.ex:127.0.0.1:1225 0 65 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred + T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred first failed = time last try = time2 next try = time2 + 1 +++++++++++++++++++++++++++ - R:userx@test.ex:<CALLER@test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<userx@test.ex>: host ipv4.ipv4.ipv4.ipv4 [ipv4.ipv4.ipv4.ipv4]: 451 Recipient deferred + R:userx@test.ex:<CALLER@test.ex> -44 13121 H=ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>: 451 Recipient deferred first failed = time last try = time2 next try = time2 + 5 * - T:thishost.test.ex:127.0.0.1:1225 0 65 SMTP error from remote mail server after initial connection: host thishost.test.ex [127.0.0.1]: 451 host deferred + T:thishost.test.ex:127.0.0.1:1225 0 65 H=thishost.test.ex [127.0.0.1]: SMTP error from remote mail server after initial connection: 451 host deferred first failed = time last try = time2 next try = time2 + 1 diff --git a/test/stdout/0554 b/test/stdout/0554 index 8c0cfea8a..2f38af2b5 100644 --- a/test/stdout/0554 +++ b/test/stdout/0554 @@ -1,5 +1,5 @@ +++++++++++++++++++++++++++ - R:x@y:<CALLER@myhost.test.ex> -44 13121 SMTP error from remote mail server after RCPT TO:<x@y>: host 127.0.0.1 [127.0.0.1]: 451 Temporary error + R:x@y:<CALLER@myhost.test.ex> -44 13121 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@y>: 451 Temporary error first failed = time last try = time2 next try = time2 + 1 +++++++++++++++++++++++++++ |