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:46:53 UTC
[28/38] james-project git commit: JAMES-2114 Improve a bit JSieve
logging
JAMES-2114 Improve a bit JSieve 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/ecccda03
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/ecccda03
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/ecccda03
Branch: refs/heads/master
Commit: ecccda03cff65acdd20b6ea65a1ca13eb64e2209
Parents: d66efa3
Author: benwa <bt...@linagora.com>
Authored: Tue Aug 15 02:21:58 2017 +0700
Committer: benwa <bt...@linagora.com>
Committed: Thu Aug 24 10:34:43 2017 +0700
----------------------------------------------------------------------
.../transport/mailets/jsieve/ActionContext.java | 7 -----
.../transport/mailets/jsieve/ActionUtils.java | 10 ++++---
.../mailets/jsieve/FileIntoAction.java | 28 +++++++++-----------
.../mailets/jsieve/RedirectAction.java | 9 ++++---
.../transport/mailets/jsieve/RejectAction.java | 5 +++-
.../mailets/jsieve/SieveMailAdapter.java | 18 ++-----------
.../mailets/jsieve/VacationAction.java | 5 +++-
.../transport/mailets/jsieve/VacationReply.java | 6 +++--
.../mailets/jsieve/delivery/SieveExecutor.java | 1 -
9 files changed, 37 insertions(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/ecccda03/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java
index 5203279..6800d8e 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionContext.java
@@ -23,7 +23,6 @@ import java.util.Collection;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.commons.logging.Log;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.joda.time.DateTime;
@@ -47,12 +46,6 @@ public interface ActionContext {
* @return Recipient receiving the given eMail
*/
MailAddress getRecipient();
-
- /**
- * Gets the log.
- * @return not null
- */
- public Log getLog();
/**
* Experimental mail delivery.
http://git-wip-us.apache.org/repos/asf/james-project/blob/ecccda03/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java
index 3645e8c..2354ff0 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/ActionUtils.java
@@ -23,13 +23,15 @@ import javax.mail.MessagingException;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utility methods helpful for actions.
*/
-public class ActionUtils
-{
-
+public class ActionUtils {
+ private static final Logger LOGGER = LoggerFactory.getLogger(ActionUtils.class);
+
private final static String ATTRIBUTE_PREFIX = ActionUtils.class.getPackage().getName() + ".";
/**
@@ -71,7 +73,7 @@ public class ActionUtils
MessagingException ex = new MessagingException(
"This message is looping! Message ID: "
+ aMail.getMessage().getMessageID());
- context.getLog().warn(ex.getMessage(), ex);
+ LOGGER.warn(ex.getMessage(), ex);
throw ex;
}
aMail.setAttribute(ATTRIBUTE_PREFIX + anAttributeSuffix,
http://git-wip-us.apache.org/repos/asf/james-project/blob/ecccda03/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
index 6a56482..24f08ce 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/FileIntoAction.java
@@ -20,11 +20,12 @@ package org.apache.james.transport.mailets.jsieve;
import javax.mail.MessagingException;
-import org.apache.commons.logging.Log;
import org.apache.jsieve.mail.Action;
import org.apache.jsieve.mail.ActionFileInto;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Performs the filing of a mail into a specified destination.
@@ -32,7 +33,8 @@ import org.apache.mailet.MailAddress;
* <p>An instance maybe safe accessed concurrently by multiple threads.</p>
*/
public class FileIntoAction implements MailAction {
-
+ private static final Logger LOGGER = LoggerFactory.getLogger(FileIntoAction.class);
+
private static final char HIERARCHY_DELIMITER = '.';
public void execute(Action action, Mail mail, ActionContext context) throws MessagingException {
@@ -67,13 +69,11 @@ public class FileIntoAction implements MailAction {
* @param context not null
* @throws MessagingException
*/
- public void execute(ActionFileInto anAction, Mail aMail, final ActionContext context) throws MessagingException
- {
+ public void execute(ActionFileInto anAction, Mail aMail, final ActionContext context) throws MessagingException {
String destinationMailbox = anAction.getDestination();
MailAddress recipient;
boolean delivered = false;
- try
- {
+ try {
recipient = ActionUtils.getSoleRecipient(aMail);
if (!(destinationMailbox.length() > 0
@@ -87,19 +87,15 @@ public class FileIntoAction implements MailAction {
context.post(url, aMail);
delivered = true;
}
- catch (MessagingException ex)
- {
- final Log log = context.getLog();
- if (log.isDebugEnabled()) {
- log.debug("Error while storing mail into. "+destinationMailbox, ex);
+ catch (MessagingException ex) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Error while storing mail into. "+destinationMailbox, ex);
}
throw ex;
}
- if (delivered)
- {
- final Log log = context.getLog();
- if (log.isDebugEnabled()) {
- log.debug("Filed Message ID: "
+ if (delivered) {
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Filed Message ID: "
+ aMail.getMessage().getMessageID()
+ " into destination: \""
+ destinationMailbox + "\"");
http://git-wip-us.apache.org/repos/asf/james-project/blob/ecccda03/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
index 127125c..6d48cc8 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RedirectAction.java
@@ -24,11 +24,12 @@ import java.util.Collection;
import javax.mail.MessagingException;
import javax.mail.internet.InternetAddress;
-import org.apache.commons.logging.Log;
import org.apache.jsieve.mail.Action;
import org.apache.jsieve.mail.ActionRedirect;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Performs the redirection of a mail.
@@ -36,6 +37,7 @@ import org.apache.mailet.MailAddress;
* <p>An instance maybe safe accessed concurrently by multiple threads.</p>
*/
public class RedirectAction implements MailAction {
+ private static final Logger LOGGER = LoggerFactory.getLogger(RedirectAction.class.getName());
public void execute(Action action, Mail mail, ActionContext context)
throws MessagingException {
@@ -61,9 +63,8 @@ public class RedirectAction implements MailAction {
recipients.add(new MailAddress(new InternetAddress(anAction.getAddress())));
MailAddress sender = aMail.getSender();
context.post(sender, recipients, aMail.getMessage());
- Log log = context.getLog();
- if (log.isDebugEnabled()) {
- log.debug("Redirected Message ID: "
+ if (LOGGER.isDebugEnabled()) {
+ LOGGER.debug("Redirected Message ID: "
+ aMail.getMessage().getMessageID() + " to \""
+ anAction.getAddress() + "\"");
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ecccda03/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
index 94c3666..2cd5dc0 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/RejectAction.java
@@ -40,6 +40,8 @@ import org.apache.jsieve.mail.Action;
import org.apache.jsieve.mail.ActionReject;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Performs the rejection of a mail, with a reply to the sender.
@@ -47,6 +49,7 @@ import org.apache.mailet.MailAddress;
* <p>An instance maybe safe accessed concurrently by multiple threads.</p>
*/
public class RejectAction implements MailAction {
+ private static final Logger LOGGER = LoggerFactory.getLogger(RejectAction.class);
public void execute(Action action, Mail mail, ActionContext context)
throws MessagingException {
@@ -135,7 +138,7 @@ public class RejectAction implements MailAction {
}
else
{
- context.getLog().info("Unable to send reject MDN. Could not determine the recipient.");
+ LOGGER.info("Unable to send reject MDN. Could not determine the recipient.");
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ecccda03/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
index a8a4fd8..8befe47 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/SieveMailAdapter.java
@@ -33,8 +33,6 @@ import javax.mail.Header;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMessage;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
import org.apache.james.mime4j.dom.address.AddressList;
import org.apache.james.mime4j.dom.address.Mailbox;
import org.apache.james.mime4j.dom.address.MailboxList;
@@ -56,18 +54,14 @@ import org.apache.mailet.MailetContext;
import org.joda.time.DateTime;
import com.google.common.collect.Lists;
+
/**
* <p>
* Class <code>SieveMailAdapter</code> implements a <code>MailAdapter</code>
* for use in a Mailet environment.
* </p>
*/
-public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionContext
-{
- private static final Log LOG = LogFactory.getLog(SieveMailAdapter.class);
-
- private Log log = LOG;
-
+public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionContext {
/**
* The Mail being adapted.
*/
@@ -118,10 +112,6 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
return recipient;
}
- public void setLog(Log log) {
- this.log = log;
- }
-
/**
* Returns the message.
*
@@ -434,10 +424,6 @@ public class SieveMailAdapter implements MailAdapter, EnvelopeAccessors, ActionC
}
}
- public Log getLog() {
- return log;
- }
-
public String getServerInfo() {
return getMailetContext().getServerInfo();
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ecccda03/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java
index f83126c..9453de5 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationAction.java
@@ -30,12 +30,15 @@ import org.apache.jsieve.mail.optional.ActionVacation;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.joda.time.Days;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
public class VacationAction implements MailAction {
+ private static final Logger LOGGER = LoggerFactory.getLogger(VacationAction.class);
@Override
public void execute(Action action, Mail mail, ActionContext context) throws MessagingException {
@@ -77,7 +80,7 @@ public class VacationAction implements MailAction {
try {
return new MailAddress(address);
} catch (AddressException e) {
- context.getLog().warn("Mail address " + address + " was not well formatted : " + e.getLocalizedMessage());
+ LOGGER.warn("Mail address " + address + " was not well formatted : " + e.getLocalizedMessage());
return null;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ecccda03/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java
index 12cc1f7..028b0e6 100644
--- a/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java
+++ b/server/mailet/mailets/src/main/java/org/apache/james/transport/mailets/jsieve/VacationReply.java
@@ -33,13 +33,15 @@ import javax.mail.util.ByteArrayDataSource;
import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.google.common.base.Optional;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
public class VacationReply {
-
+ private static final Logger LOGGER = LoggerFactory.getLogger(VacationReply.class);
public static class Builder {
@@ -134,7 +136,7 @@ public class VacationReply {
try {
return new MailAddress(address);
} catch (AddressException e) {
- context.getLog().warn("Mail address " + address + " was not well formatted : " + e.getLocalizedMessage());
+ LOGGER.warn("Mail address " + address + " was not well formatted : " + e.getLocalizedMessage());
return null;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/ecccda03/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 f770218..7834f42 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
@@ -136,7 +136,6 @@ public class SieveExecutor {
SieveMailAdapter aMailAdapter = new SieveMailAdapter(aMail,
mailetContext, actionDispatcher, sievePoster, userSieveInformation.getScriptActivationDate(),
userSieveInformation.getScriptInterpretationDate(), recipient);
- aMailAdapter.setLog(log);
// This logging operation is potentially costly
log.debug("Evaluating " + aMailAdapter.toString() + " against \"" + recipient.asPrettyString() + "\"");
factory.evaluate(aMailAdapter, factory.parse(userSieveInformation.getScriptContent()));
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org