(james-project) 01/02: [IMPROVEMENT] Improve debug log for allowing tracing mailet container execution

[rcordier]

This is an automated email from the ASF dual-hosted git repository.

rcordier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git

commit a40d59d542bd9cd9ddf5304f57e8ed37cf6f8165
Author: Benoit TELLIER <btell...@linagora.com>
AuthorDate: Tue Nov 26 17:07:09 2024 +0100

    [IMPROVEMENT] Improve debug log for allowing tracing mailet container 
execution
---
 .../apache/james/mailetcontainer/impl/CompositeProcessorImpl.java    | 2 +-
 .../java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java | 2 +-
 .../org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java   | 5 ++++-
 .../apache/james/mailetcontainer/impl/MailetProcessorImplTest.java   | 2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git 
a/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImpl.java
 
b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImpl.java
index 80e7ac5e1b..9c05a2ecc3 100644
--- 
a/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImpl.java
+++ 
b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/CompositeProcessorImpl.java
@@ -62,7 +62,7 @@ public class CompositeProcessorImpl extends 
AbstractStateCompositeProcessor {
 
     @Override
     protected MailProcessor createMailProcessor(String name, 
HierarchicalConfiguration<ImmutableNode> config) throws Exception {
-        MailetProcessorImpl processor = new MailetProcessorImpl(metricFactory);
+        MailetProcessorImpl processor = new MailetProcessorImpl(name, 
metricFactory);
         try {
             processor.setMailetContext(mailetContext);
             processor.setMailetLoader(mailetLoader);
diff --git 
a/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
 
b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
index 3fb639c26d..131586b36b 100644
--- 
a/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
+++ 
b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/JamesMailSpooler.java
@@ -129,7 +129,7 @@ public class JamesMailSpooler implements Disposable, 
Configurable, MailSpoolerMB
         }
 
         private void performProcessMail(MailQueueItem queueItem, Mail mail) {
-            LOGGER.debug("==== Begin processing mail {} ====", mail.getName());
+            LOGGER.debug("==== Begin processing mail {} with state {} ====", 
mail.getName(), mail.getState());
             ImmutableList<MailAddress> originalRecipients = 
ImmutableList.copyOf(mail.getRecipients());
             try {
                 mailProcessor.service(mail);
diff --git 
a/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java
 
b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java
index 7794b5a9e2..18fec5efef 100644
--- 
a/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java
+++ 
b/server/mailet/mailetcontainer-impl/src/main/java/org/apache/james/mailetcontainer/impl/MailetProcessorImpl.java
@@ -114,16 +114,19 @@ public class MailetProcessorImpl extends 
AbstractStateMailetProcessor {
 
     private static final Logger LOGGER = 
LoggerFactory.getLogger(MailetProcessorImpl.class);
 
+    private final String name;
     private final MetricFactory metricFactory;
     private List<MatcherMailetPair> pairs;
     private Map<MatcherSplitter, ProcessorImpl> pairsToBeProcessed;
 
-    public MailetProcessorImpl(MetricFactory metricFactory) {
+    public MailetProcessorImpl(String name, MetricFactory metricFactory) {
+        this.name = name;
         this.metricFactory = metricFactory;
     }
 
     @Override
     public void service(Mail mail) {
+        LOGGER.debug("Executing {} on {}", mail.getName(), name);
         ProcessingStep lastStep = pairsToBeProcessed.entrySet().stream()
             .reduce(ProcessingStep.initial(mail), (processingStep, pair) -> {
                 if (processingStep.test()) {
diff --git 
a/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/MailetProcessorImplTest.java
 
b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/MailetProcessorImplTest.java
index 18a971610f..51ba22afb0 100644
--- 
a/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/MailetProcessorImplTest.java
+++ 
b/server/mailet/mailetcontainer-impl/src/test/java/org/apache/james/mailetcontainer/impl/MailetProcessorImplTest.java
@@ -37,7 +37,7 @@ public class MailetProcessorImplTest extends 
AbstractStateMailetProcessorTest {
     protected AbstractStateMailetProcessor 
createProcessor(HierarchicalConfiguration<ImmutableNode> configuration) throws 
Exception {
         MailetProcessorImpl processor = null;
         try {
-            processor = new MailetProcessorImpl(new RecordingMetricFactory());
+            processor = new MailetProcessorImpl("anyName", new 
RecordingMetricFactory());
             processor.setMailetContext(FakeMailContext.defaultContext());
             processor.setMailetLoader(new MockMailetLoader());
             processor.setMatcherLoader(new MockMatcherLoader());


---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscr...@james.apache.org
For additional commands, e-mail: notifications-h...@james.apache.org