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
commit 9cf4dd64430696ec2fd4e46c9b3e6ac36328c0df Author: Matthieu Baechler <[email protected]> AuthorDate: Fri Mar 27 11:37:50 2020 +0100 JAMES-3041 processingActive should be decremented on errors too --- .../apache/james/mailetcontainer/impl/JamesMailSpooler.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java index aaa86d7..9737865 100644 --- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java +++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java @@ -111,14 +111,10 @@ public class JamesMailSpooler implements Disposable, Configurable, MailSpoolerMB private Mono<Void> handleOnQueueItem(MailQueueItem queueItem) { TimeMetric timeMetric = metricFactory.timer(SPOOL_PROCESSING); - try { - return Mono.fromCallable(processingActive::incrementAndGet) - .flatMap(ignore -> processMail(queueItem)) - .doOnSuccess(any -> timeMetric.stopAndPublish().logWhenExceedP99(DEFAULT_100_MS_THRESHOLD)) - .doOnSuccess(any -> processingActive.decrementAndGet()); - } catch (Throwable e) { - return Mono.error(e); - } + return Mono.fromCallable(processingActive::incrementAndGet) + .flatMap(ignore -> processMail(queueItem)) + .doOnSuccess(any -> timeMetric.stopAndPublish().logWhenExceedP99(DEFAULT_100_MS_THRESHOLD)) + .doOnTerminate(processingActive::decrementAndGet); } private Mono<Void> processMail(MailQueueItem queueItem) { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
