git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
EXPERIMENTAL_DSN: use the SMTP return messsage for Diagnostic-Code lines. Bug 1559
[users/heiko/exim.git]
/
test
/
stderr
/
0357
diff --git
a/test/stderr/0357
b/test/stderr/0357
index 0bd08647ede6c835e3785368d7b8de4feb1bd5d2..6073e8c62889b53bbe0a9522518b1c27295b0a49 100644
(file)
--- a/
test/stderr/0357
+++ b/
test/stderr/0357
@@
-28,7
+28,7
@@
added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A
reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
added retry item
LOG: MAIN
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
+ == 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:<userx@test.ex>
: 451 Temporary error
Processing retry items
Succeeded addresses:
Failed addresses:
Processing retry items
Succeeded addresses:
Failed addresses:
@@
-39,7
+39,7
@@
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:<CALLER@test.ex>
first failed=dddd last try=dddd next try=+1 expired=0
failing_interval=ttt message_age=ttt
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
+ errno=-44 more_errno=dd,A
H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>
: 451 Temporary error
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
end of retry processing
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
@@
-79,7
+79,7
@@
reading retry information for R:userx@test.ex from subprocess
reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
delete item not added: non-delete item exists
LOG: MAIN
reading retry information for R:userx@test.ex:<CALLER@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:<userx@test.ex>: 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:<userx@test.ex>
: 451 Temporary error
Processing retry items
Succeeded addresses:
Failed addresses:
Processing retry items
Succeeded addresses:
Failed addresses:
@@
-92,7
+92,7
@@
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:<CALLER@test.ex>
first failed=dddd last try=dddd next try=+1 expired=0
failing_interval=ttt message_age=ttt
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
+ errno=-44 more_errno=dd,A
H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>
: 451 Temporary error
end of retry processing
LOG: queue_run MAIN
End queue run: pid=pppp
end of retry processing
LOG: queue_run MAIN
End queue run: pid=pppp
@@
-133,7
+133,7
@@
reading retry information for R:userx@test.ex from subprocess
reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
delete item not added: non-delete item exists
LOG: MAIN
reading retry information for R:userx@test.ex:<CALLER@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:<userx@test.ex>: 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:<userx@test.ex>
: 451 Temporary error
Processing retry items
Succeeded addresses:
Failed addresses:
Processing retry items
Succeeded addresses:
Failed addresses:
@@
-146,7
+146,7
@@
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:<CALLER@test.ex>
first failed=dddd last try=dddd next try=+2 expired=0
failing_interval=ttt message_age=ttt
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
+ errno=-44 more_errno=dd,A
H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<userx@test.ex>
: 451 Temporary error
end of retry processing
LOG: queue_run MAIN
End queue run: pid=pppp
end of retry processing
LOG: queue_run MAIN
End queue run: pid=pppp
@@
-160,6
+160,9
@@
locking TESTSUITE/spool/db/retry.lockfile
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Considering: userx@test.ex
no domain retry record
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
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
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
LOG: retry_defer MAIN
== userx@test.ex routing defer (-51): retry time not reached
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>