JAMES-2340 Add missing metric collection in SpamAssassin
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/213965f4 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/213965f4 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/213965f4 Branch: refs/heads/master Commit: 213965f40ef47a4fdb0601d0c9d292b3b42afbe1 Parents: fb19312 Author: benwa <[email protected]> Authored: Wed Mar 28 16:38:51 2018 +0700 Committer: benwa <[email protected]> Committed: Thu Mar 29 16:45:36 2018 +0700 ---------------------------------------------------------------------- .../org/apache/james/util/scanner/SpamAssassinInvoker.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/213965f4/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java ---------------------------------------------------------------------- diff --git a/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java b/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java index 69047bc..12bb7f2 100644 --- a/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java +++ b/server/container/util/src/main/java/org/apache/james/util/scanner/SpamAssassinInvoker.java @@ -92,8 +92,12 @@ public class SpamAssassinInvoker { * if an error on scanning is detected */ public SpamAssassinResult scanMail(MimeMessage message, String user) throws MessagingException { - return scanMailWithAdditionalHeaders(message, - "User: " + user); + return metricFactory.withMetric( + "spamAssassin-check", + Throwing.supplier( + () -> scanMailWithAdditionalHeaders(message, + "User: " + user)) + .sneakyThrow()); } public SpamAssassinResult scanMail(MimeMessage message) throws MessagingException { --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
