You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2017/08/24 03:47:01 UTC
[36/38] james-project git commit: JAMES-2114 Sieve should use SLF4J
JAMES-2114 Sieve should use SLF4J
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/88bc153b
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/88bc153b
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/88bc153b
Branch: refs/heads/master
Commit: 88bc153bfbd0063436b2f735693343d890577faf
Parents: f35ab92
Author: benwa <bt...@linagora.com>
Authored: Tue Aug 15 14:43:49 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Aug 24 10:34:44 2017 +0700
----------------------------------------------------------------------
.../mailets/jsieve/delivery/SieveExecutor.java | 19 ++++++++++---------
1 file changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/88bc153b/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 7834f42..ceb8d09 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
@@ -38,11 +38,14 @@ import org.apache.jsieve.parser.generated.TokenMgrError;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
import com.google.common.collect.ImmutableList;
public class SieveExecutor {
+ private static final Logger LOGGER = LoggerFactory.getLogger(SieveExecutor.class);
public static Builder builder() {
return new Builder();
@@ -88,7 +91,6 @@ public class SieveExecutor {
private final ResourceLocator resourceLocator;
private final SieveFactory factory;
private final ActionDispatcher actionDispatcher;
- private final Log log;
public SieveExecutor(MailetContext mailetContext, SievePoster sievePoster,
ResourceLocator resourceLocator, Log log) throws MessagingException {
@@ -97,7 +99,6 @@ public class SieveExecutor {
this.resourceLocator = resourceLocator;
factory = createFactory(log);
this.actionDispatcher = new ActionDispatcher();
- this.log = log;
}
private SieveFactory createFactory(Log log) throws MessagingException {
@@ -114,30 +115,30 @@ public class SieveExecutor {
Preconditions.checkNotNull(recipient, "Recipient for mail to be spooled cannot be null.");
Preconditions.checkNotNull(mail.getMessage(), "Mail message to be spooled cannot be null.");
- return sieveMessage(recipient, mail, log);
+ return sieveMessage(recipient, mail);
}
- protected boolean sieveMessage(MailAddress recipient, Mail aMail, Log log) throws MessagingException {
+ protected boolean sieveMessage(MailAddress recipient, Mail aMail) throws MessagingException {
try {
ResourceLocator.UserSieveInformation userSieveInformation = resourceLocator.get(recipient);
- sieveMessageEvaluate(recipient, aMail, userSieveInformation, log);
+ sieveMessageEvaluate(recipient, aMail, userSieveInformation);
return true;
} catch (ScriptNotFoundException e) {
- log.info("Can not locate SIEVE script for user " + recipient.asPrettyString());
+ LOGGER.info("Can not locate SIEVE script for user " + recipient.asPrettyString());
return false;
} catch (Exception ex) {
- log.error("Cannot evaluate Sieve script for user " + recipient.asPrettyString(), ex);
+ LOGGER.error("Cannot evaluate Sieve script for user " + recipient.asPrettyString(), ex);
return false;
}
}
- private void sieveMessageEvaluate(MailAddress recipient, Mail aMail, ResourceLocator.UserSieveInformation userSieveInformation, Log log) throws MessagingException, IOException {
+ private void sieveMessageEvaluate(MailAddress recipient, Mail aMail, ResourceLocator.UserSieveInformation userSieveInformation) throws MessagingException, IOException {
try {
SieveMailAdapter aMailAdapter = new SieveMailAdapter(aMail,
mailetContext, actionDispatcher, sievePoster, userSieveInformation.getScriptActivationDate(),
userSieveInformation.getScriptInterpretationDate(), recipient);
// This logging operation is potentially costly
- log.debug("Evaluating " + aMailAdapter.toString() + " against \"" + recipient.asPrettyString() + "\"");
+ LOGGER.debug("Evaluating " + aMailAdapter.toString() + " against \"" + recipient.asPrettyString() + "\"");
factory.evaluate(aMailAdapter, factory.parse(userSieveInformation.getScriptContent()));
} catch (SieveException | ParseException ex) {
handleFailure(recipient, aMail, ex);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org