openwebbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rmannibu...@apache.org
Subject svn commit: r1766543 - in /openwebbeans/microwave/trunk/microwave-core: pom.xml src/main/java/org/apache/microwave/logging/log4j2/MicrowaveLogEventFactory.java src/main/resources/log4j2.component.properties
Date Tue, 25 Oct 2016 15:07:14 GMT
Author: rmannibucau
Date: Tue Oct 25 15:07:14 2016
New Revision: 1766543

URL: http://svn.apache.org/viewvc?rev=1766543&view=rev
Log:
log4j2 source respect

Added:
    openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/logging/log4j2/MicrowaveLogEventFactory.java
    openwebbeans/microwave/trunk/microwave-core/src/main/resources/log4j2.component.properties
Modified:
    openwebbeans/microwave/trunk/microwave-core/pom.xml

Modified: openwebbeans/microwave/trunk/microwave-core/pom.xml
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/pom.xml?rev=1766543&r1=1766542&r2=1766543&view=diff
==============================================================================
--- openwebbeans/microwave/trunk/microwave-core/pom.xml (original)
+++ openwebbeans/microwave/trunk/microwave-core/pom.xml Tue Oct 25 15:07:14 2016
@@ -231,6 +231,9 @@
                 <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                   <resource>META-INF/cxf/bus-extensions.txt</resource>
                 </transformer>
+                <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
+                  <resource>log4j2.component.properties</resource>
+                </transformer>
                 <transformer implementation="com.github.edwgiz.mavenShadePlugin.log4j2CacheTransformer.PluginsCacheFileTransformer"
/>
                 <transformer implementation="org.apache.openwebbeans.maven.shade.OpenWebBeansPropertiesTransformer"
/>
               </transformers>

Added: openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/logging/log4j2/MicrowaveLogEventFactory.java
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/logging/log4j2/MicrowaveLogEventFactory.java?rev=1766543&view=auto
==============================================================================
--- openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/logging/log4j2/MicrowaveLogEventFactory.java
(added)
+++ openwebbeans/microwave/trunk/microwave-core/src/main/java/org/apache/microwave/logging/log4j2/MicrowaveLogEventFactory.java
Tue Oct 25 15:07:14 2016
@@ -0,0 +1,70 @@
+/*
+ * 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.microwave.logging.log4j2;
+
+import org.apache.logging.log4j.Level;
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Property;
+import org.apache.logging.log4j.core.impl.DefaultLogEventFactory;
+import org.apache.logging.log4j.core.impl.Log4jLogEvent;
+import org.apache.logging.log4j.message.Message;
+
+import java.util.List;
+
+public class MicrowaveLogEventFactory extends DefaultLogEventFactory {
+    @Override
+    public LogEvent createEvent(final String loggerName, final Marker marker, final String
fqcn,
+                                final Level level, final Message data, final List<Property>
properties,
+                                final Throwable t) {
+        return new MicrowaveLog4jLogEvent(loggerName, marker, fqcn, level, data, properties,
t);
+    }
+
+    public static class MicrowaveLog4jLogEvent extends Log4jLogEvent {
+        private StackTraceElement source;
+
+        public MicrowaveLog4jLogEvent(final String loggerName, final Marker marker, final
String fqcn, final Level level,
+                                      final Message data, final List<Property> properties,
final Throwable t) {
+            super(loggerName, marker, fqcn, level, data, properties, t);
+        }
+
+        @Override
+        public StackTraceElement getSource() { // this doesn't work OOTB and no config available
+            if (source != null) {
+                return source;
+            }
+            if (getLoggerFqcn() == null || !isIncludeLocation()) {
+                return null;
+            }
+
+            final StackTraceElement[] stackTrace = new Throwable().getStackTrace();
+            for (int i = stackTrace.length - 1; i > 0; i--) {
+                final String className = stackTrace[i].getClassName();
+                if (getLoggerFqcn().equals(className) && stackTrace.length > i
+ 1) {
+                    source = stackTrace[i + 1];
+                    if (i + 3 < stackTrace.length && stackTrace[i + 2].getClassName().equals("org.apache.microwave.logging.tomcat.LogFacade"))
{
+                        source = stackTrace[i + 3];
+                    }
+                    break;
+                }
+            }
+            return source;
+        }
+    }
+}

Added: openwebbeans/microwave/trunk/microwave-core/src/main/resources/log4j2.component.properties
URL: http://svn.apache.org/viewvc/openwebbeans/microwave/trunk/microwave-core/src/main/resources/log4j2.component.properties?rev=1766543&view=auto
==============================================================================
--- openwebbeans/microwave/trunk/microwave-core/src/main/resources/log4j2.component.properties
(added)
+++ openwebbeans/microwave/trunk/microwave-core/src/main/resources/log4j2.component.properties
Tue Oct 25 15:07:14 2016
@@ -0,0 +1,17 @@
+#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.
+Log4jLogEventFactory = org.apache.microwave.logging.log4j2.MicrowaveLogEventFactory



Mime
View raw message