Merge pull request #44 from dmlloyd/stack

Improve performance of publication
jboss-logging · May 21, 2024 · 30e0651 · 30e0651
2 parents 1218126 + 19d25db
commit 30e0651
Show file tree

Hide file tree

Showing 4 changed files with 47 additions and 42 deletions.
diff --git a/src/main/java/org/apache/log4j/JBossAppenderHandler.java b/src/main/java/org/apache/log4j/JBossAppenderHandler.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.apache.log4j.spi.Filter;
 import org.apache.log4j.spi.LoggingEvent;
 import org.jboss.logmanager.ExtHandler;
 import org.jboss.logmanager.ExtLogRecord;
@@ -27,12 +28,28 @@ protected JBossAppenderHandler(final Logger logger) {
 
     @Override
     protected void doPublish(final ExtLogRecord record) {
-        final LoggingEvent event = new LoggingEvent(record, JBossLogManagerFacade.getLogger(logger));
+        final LoggingEvent event = new LoggingEvent(record, logger.getLogContext());
         final List<Appender> appenders = Appenders.getAppenderList(logger);
-        for (Appender appender : appenders) {
-            if (new JBossFilterWrapper(appender.getFilter(), true).isLoggable(record)) {
-                appender.doAppend(event);
+        outer: for (Appender appender : appenders) {
+            Filter filter = appender.getFilter();
+            inner: while (filter != null) {
+                switch (appender.getFilter().decide(event)) {
+                    case Filter.DENY: {
+                        // skip this appender
+                        continue outer;
+                    }
+                    case Filter.ACCEPT: {
+                        // accept this message
+                        break inner;
+                    }
+                    default: {
+                        // defer decision
+                        break;
+                    }
+                }
+                filter = filter.getNext();
             }
+            appender.doAppend(event);
         }
     }
 

diff --git a/src/main/java/org/apache/log4j/JBossFilterWrapper.java b/src/main/java/org/apache/log4j/JBossFilterWrapper.java
diff --git a/src/main/java/org/apache/log4j/JBossLogManagerFacade.java b/src/main/java/org/apache/log4j/JBossLogManagerFacade.java
@@ -131,7 +131,7 @@ static Logger exists(String name) {
      *
      * @return the logger or {@code null} if no logger is attached.
      */
-    static Logger getLogger(org.jboss.logmanager.Logger lmLogger) {
+    public static Logger getLogger(org.jboss.logmanager.Logger lmLogger) {
         return getAttachment(lmLogger, LOGGER_KEY);
     }
 

diff --git a/src/main/java/org/apache/log4j/spi/LoggingEvent.java b/src/main/java/org/apache/log4j/spi/LoggingEvent.java
@@ -12,7 +12,10 @@
 import java.util.Hashtable;
 import java.util.Map;
 import java.util.Set;
+
+import org.apache.log4j.JBossLogManagerFacade;
 import org.jboss.logmanager.ExtLogRecord;
+import org.jboss.logmanager.LogContext;
 import org.jboss.modules.Module;
 
 import org.apache.log4j.Category;
@@ -74,6 +77,7 @@ public class LoggingEvent implements Serializable {
     public final transient String fqnOfCategoryClass;
     public transient Priority level;
 
+    private transient final org.jboss.logmanager.LogContext logContext;
     private transient Category logger;
 
     //// Private fields
@@ -104,6 +108,7 @@ public LoggingEvent(String fqnOfCategoryClass, Category logger, Priority level,
             logRecord.setThrown(throwable);
         }
         logRecord.setMillis(timeStamp = System.currentTimeMillis());
+        logContext = null;
     }
 
     public LoggingEvent(String fqnOfCategoryClass, Category logger, long timeStamp, Priority level, Object message, Throwable throwable) {
@@ -120,6 +125,7 @@ public LoggingEvent(String fqnOfCategoryClass, Category logger, long timeStamp,
             logRecord.setThrown(throwable);
         }
         logRecord.setMillis(this.timeStamp = timeStamp);
+        logContext = null;
     }
 
     public LoggingEvent(final String fqnOfCategoryClass, final Category logger, final long timeStamp, final Level level, final Object message, final String threadName, final ThrowableInformation throwable, final String ndc, final LocationInfo info, final java.util.Map properties) {
@@ -157,17 +163,29 @@ public LoggingEvent(final String fqnOfCategoryClass, final Category logger, fina
         if (properties != null) {
             logRecord.setMdc(properties);
         }
+        logContext = null;
     }
 
-    // our own constructor
+    // our own constructors
 
+    // This one is for testing only!
     public LoggingEvent(final ExtLogRecord logRecord, final Category logger) {
         this.logRecord = logRecord;
         fqnOfCategoryClass = logRecord.getLoggerClassName();
         this.logger = logger;
         level = JBossLevelMapping.getPriorityFor(logRecord.getLevel());
         categoryName = logRecord.getLoggerName();
         timeStamp = logRecord.getMillis();
+        logContext = null;
+    }
+
+    public LoggingEvent(final ExtLogRecord logRecord, final LogContext logContext) {
+        this.logRecord = logRecord;
+        fqnOfCategoryClass = logRecord.getLoggerClassName();
+        level = JBossLevelMapping.getPriorityFor(logRecord.getLevel());
+        categoryName = logRecord.getLoggerName();
+        timeStamp = logRecord.getMillis();
+        this.logContext = logContext;
     }
 
     public LocationInfo getLocationInformation() {
@@ -186,6 +204,12 @@ public String getLoggerName() {
     }
 
     public Category getLogger() {
+        Category logger = this.logger;
+        if (logger == null) {
+            // lazily populate
+            assert logContext != null; // otherwise, our `logger` would be populated per constructor
+            logger = this.logger = JBossLogManagerFacade.getLogger(logContext.getLogger(categoryName));
+        }
         return logger;
     }