From c3f2eb9a7d99f12fb5b20d88e9bc18a0aa016d64 Mon Sep 17 00:00:00 2001 From: Jeremy Harris Date: Tue, 17 May 2016 21:07:39 +0100 Subject: Delivery: clarify error log line. Bug 1782 "retry time not reached for any host after a long failure period" has generated so many queries it plainly is not clear. Replace with "all hosts for 'dom.ain' have been failing for a long time (and retry time not reached)". --- test/log/0461 | 4 ++-- test/mail/0461.CALLER | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'test') diff --git a/test/log/0461 b/test/log/0461 index 49370d558..840265f82 100644 --- a/test/log/0461 +++ b/test/log/0461 @@ -11,7 +11,7 @@ 1999-03-02 09:44:33 10HmaZ-0005vi-00 => userx@test.ex R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK" 1999-03-02 09:44:33 10HmaZ-0005vi-00 Completed 1999-03-02 09:44:33 10HmbA-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmbA-0005vi-00 ** userx@test.ex R=r1 T=t1: retry time not reached for any host after a long failure period +1999-03-02 09:44:33 10HmbA-0005vi-00 ** userx@test.ex R=r1 T=t1: all hosts for 'test.ex' have been failing for a long time (and retry time not reached) 1999-03-02 09:44:33 10HmbB-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmbB-0005vi-00 => CALLER R=r0 T=t2 1999-03-02 09:44:33 10HmbB-0005vi-00 Completed @@ -29,7 +29,7 @@ 1999-03-02 09:44:33 10HmbC-0005vi-00 Completed 1999-03-02 09:44:33 End queue run: pid=pppp 1999-03-02 09:44:33 10HmbE-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss -1999-03-02 09:44:33 10HmbE-0005vi-00 ** userx@test.ex R=r1 T=t1: retry time not reached for any host after a long failure period +1999-03-02 09:44:33 10HmbE-0005vi-00 ** userx@test.ex R=r1 T=t1: all hosts for 'test.ex' have been failing for a long time (and retry time not reached) 1999-03-02 09:44:33 10HmbF-0005vi-00 <= <> R=10HmbE-0005vi-00 U=EXIMUSER P=local S=sss 1999-03-02 09:44:33 10HmbF-0005vi-00 => CALLER R=r0 T=t2 1999-03-02 09:44:33 10HmbF-0005vi-00 Completed diff --git a/test/mail/0461.CALLER b/test/mail/0461.CALLER index 35a3ff77a..7321dd6db 100644 --- a/test/mail/0461.CALLER +++ b/test/mail/0461.CALLER @@ -21,7 +21,7 @@ A message that you sent could not be delivered to one or more of its recipients. This is a permanent error. The following address(es) failed: userx@test.ex - retry time not reached for any host after a long failure period + all hosts for 'test.ex' have been failing for a long time (and retry time not reached) --NNNNNNNNNN-eximdsn-MMMMMMMMMM Content-type: message/delivery-status @@ -121,7 +121,7 @@ A message that you sent could not be delivered to one or more of its recipients. This is a permanent error. The following address(es) failed: userx@test.ex - retry time not reached for any host after a long failure period + all hosts for 'test.ex' have been failing for a long time (and retry time not reached) --NNNNNNNNNN-eximdsn-MMMMMMMMMM Content-type: message/delivery-status -- cgit v1.2.3