This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
The following commit(s) were added to refs/heads/master by this push:
new 395260c JAMES-3256 Dis-ambiguate MailDispatcher error logs
new c021c5c Merge pull request #347 from chibenwa/JAMES-3526
395260c is described below
commit 395260c033e31dd6e8d31a8ed79cbd69acd43555
Author: Benoit Tellier <[email protected]>
AuthorDate: Fri Mar 26 19:47:58 2021 +0700
JAMES-3256 Dis-ambiguate MailDispatcher error logs
---
.../org/apache/james/transport/mailets/delivery/MailDispatcher.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
index 055a56e..ec66410 100644
---
a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
+++
b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/delivery/MailDispatcher.java
@@ -146,7 +146,7 @@ public class MailDispatcher {
restoreHeaders(mail.getMessage(), savedHeaders);
} catch (Exception ex) {
- LOGGER.error("Error while storing mail.", ex);
+ LOGGER.error("Error while storing mail. This is a final
exception.", ex);
errors.add(recipient);
}
}
@@ -155,7 +155,7 @@ public class MailDispatcher {
private Mono<Void> storeMailWithRetry(Mail mail, MailAddress recipient) {
return Mono.fromRunnable((ThrowingRunnable)() ->
mailStore.storeMail(recipient, mail))
- .doOnError(error -> LOGGER.error("Error While storing mail.",
error))
+ .doOnError(error -> LOGGER.warn("Error While storing mail. This
error will be retried.", error))
.subscribeOn(scheduler)
.retryWhen(Retry.backoff(RETRIES,
FIRST_BACKOFF).maxBackoff(MAX_BACKOFF).scheduler(Schedulers.elastic()))
.then();
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
