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 ad...@apache.org on 2016/10/04 17:27:22 UTC
[3/4] james-project git commit: MAILET-135 Log mailet processing in
debug
MAILET-135 Log mailet processing in debug
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/4dd77f9e
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/4dd77f9e
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/4dd77f9e
Branch: refs/heads/master
Commit: 4dd77f9e2c85da1c08b78ce9eff2d7a7234a2853
Parents: 9a3f49c
Author: Antoine Duprat <ad...@linagora.com>
Authored: Wed Sep 21 14:55:17 2016 +0200
Committer: Antoine Duprat <ad...@apache.org>
Committed: Tue Oct 4 16:05:12 2016 +0200
----------------------------------------------------------------------
mailet/base/pom.xml | 1 -
.../mailet/base/MailetPipelineLogging.java | 68 ++++++++++++++++++++
.../api/mock/MockMailetContext.java | 5 +-
.../impl/camel/CamelProcessor.java | 3 +
4 files changed, 75 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/4dd77f9e/mailet/base/pom.xml
----------------------------------------------------------------------
diff --git a/mailet/base/pom.xml b/mailet/base/pom.xml
index d67639f..867b8c2 100644
--- a/mailet/base/pom.xml
+++ b/mailet/base/pom.xml
@@ -78,7 +78,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>test</scope>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/james-project/blob/4dd77f9e/mailet/base/src/main/java/org/apache/mailet/base/MailetPipelineLogging.java
----------------------------------------------------------------------
diff --git a/mailet/base/src/main/java/org/apache/mailet/base/MailetPipelineLogging.java b/mailet/base/src/main/java/org/apache/mailet/base/MailetPipelineLogging.java
new file mode 100644
index 0000000..e0a9069
--- /dev/null
+++ b/mailet/base/src/main/java/org/apache/mailet/base/MailetPipelineLogging.java
@@ -0,0 +1,68 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.mailet.base;
+
+import org.apache.mailet.Mail;
+import org.apache.mailet.Mailet;
+import org.apache.mailet.MailetConfig;
+import org.apache.mailet.MailetContext;
+import org.slf4j.Logger;
+
+import com.google.common.base.Function;
+import com.google.common.base.Optional;
+
+public class MailetPipelineLogging {
+
+ public static void logBeginOfMailetProcess(final Mailet mailet, final Mail mail) {
+ getLogger(mailet)
+ .transform(new Function<Logger, Boolean>() {
+
+ @Override
+ public Boolean apply(Logger logger) {
+ logger.debug("Entering mailet: {}\n\tmail state {}", mailet.getMailetInfo(), mail.getState());
+ return true;
+ }
+ });
+ }
+
+ public static void logEndOfMailetProcess(final Mailet mailet, final Mail mail) {
+ getLogger(mailet)
+ .transform(new Function<Logger, Boolean>() {
+
+ @Override
+ public Boolean apply(Logger logger) {
+ logger.debug("End of mailet: {}\n\tmail state {}", mailet.getMailetInfo(), mail.getState());
+ return true;
+ }
+ });
+ }
+
+ private static Optional<Logger> getLogger(Mailet mailet) {
+ MailetConfig mailetConfig = mailet.getMailetConfig();
+ if (mailetConfig == null) {
+ return Optional.absent();
+ }
+ MailetContext mailetContext = mailetConfig.getMailetContext();
+ if (mailetContext == null) {
+ return Optional.absent();
+ }
+ return Optional.fromNullable(mailetContext.getLogger());
+ }
+}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4dd77f9e/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java
index f3edeb9..e4f8750 100644
--- a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java
+++ b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailetContext.java
@@ -35,10 +35,13 @@ import org.apache.mailet.Mail;
import org.apache.mailet.MailAddress;
import org.apache.mailet.MailetContext;
import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
@SuppressWarnings("deprecation")
public class MockMailetContext implements MailetContext {
+ private static final Logger LOGGER = LoggerFactory.getLogger(MockMailetContext.class);
+
private final Map<String, Object> attributes = new HashMap<String, Object>();
private final List<Mail> mails = new ArrayList<Mail>();
@@ -187,6 +190,6 @@ public class MockMailetContext implements MailetContext {
@Override
public Logger getLogger() {
- return null;
+ return LOGGER;
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/4dd77f9e/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
----------------------------------------------------------------------
diff --git a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
index 8e47625..fa71705 100644
--- a/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
+++ b/server/mailet/mailetcontainer-camel/src/main/java/org/apache/james/mailetcontainer/impl/camel/CamelProcessor.java
@@ -31,6 +31,7 @@ import org.apache.james.mailetcontainer.lib.AbstractStateMailetProcessor.MailetP
import org.apache.mailet.Mail;
import org.apache.mailet.Mailet;
import org.apache.mailet.MailetConfig;
+import org.apache.mailet.base.MailetPipelineLogging;
import org.slf4j.Logger;
/**
@@ -61,6 +62,7 @@ public class CamelProcessor implements Processor {
long start = System.currentTimeMillis();
MessagingException ex = null;
try {
+ MailetPipelineLogging.logBeginOfMailetProcess(mailet, mail);
mailet.service(mail);
} catch (MessagingException me) {
ex = me;
@@ -85,6 +87,7 @@ public class CamelProcessor implements Processor {
}
} finally {
+ MailetPipelineLogging.logEndOfMailetProcess(mailet, mail);
List<MailetProcessorListener> listeners = processor.getListeners();
long complete = System.currentTimeMillis() - start;
for (MailetProcessorListener listener : listeners) {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org