JAMES-1854 SieveExecutor : improve logging
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/ac530c04 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ac530c04 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ac530c04 Branch: refs/heads/master Commit: ac530c048e47cb6807cd4c6292389305c1e04379 Parents: 376eb6c Author: Benoit Tellier <[email protected]> Authored: Sun Nov 20 23:18:50 2016 +0700 Committer: Benoit Tellier <[email protected]> Committed: Wed Nov 23 18:19:35 2016 +0700 ---------------------------------------------------------------------- .../mailets/jsieve/delivery/SieveExecutor.java | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/ac530c04/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java ---------------------------------------------------------------------- diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java index 2907af7..e6b7700 100644 --- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java +++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/delivery/SieveExecutor.java @@ -25,6 +25,7 @@ import java.io.IOException; import javax.mail.MessagingException; import org.apache.commons.logging.Log; +import org.apache.james.sieverepository.api.exception.ScriptNotFoundException; import org.apache.james.transport.mailets.delivery.DeliveryUtils; import org.apache.james.transport.mailets.jsieve.ActionDispatcher; import org.apache.james.transport.mailets.jsieve.ResourceLocator; @@ -126,21 +127,16 @@ public class SieveExecutor { Preconditions.checkNotNull(mail.getMessage(), "Mail message to be spooled cannot be null."); sieveMessage(recipient, mail, log); - // If no exception was thrown the message was successfully stored in the mailbox - log.info("Local delivered mail " + mail.getName() + " sucessfully from " + DeliveryUtils.prettyPrint(mail.getSender()) + " to " + DeliveryUtils.prettyPrint(recipient) - + " in folder " + this.folder); } protected void sieveMessage(MailAddress recipient, Mail aMail, Log log) throws MessagingException { try { ResourceLocator.UserSieveInformation userSieveInformation = resourceLocator.get(getScriptUri(recipient)); sieveMessageEvaluate(recipient, aMail, userSieveInformation, log); + } catch (ScriptNotFoundException e) { + log.info("Can not locate SIEVE script for user " + recipient.asPrettyString()); } catch (Exception ex) { - // SIEVE is a mail filtering protocol. - // Rejecting the mail because it cannot be filtered - // seems very unfriendly. - // So just log and store in INBOX - log.error("Cannot evaluate Sieve script. Storing mail in user INBOX.", ex); + log.error("Cannot evaluate Sieve script for user " + recipient.asPrettyString(), ex); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
