You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by gg...@apache.org on 2016/09/20 00:12:23 UTC
[1/9] logging-log4j2 git commit: [LOG4J2-1597]
Repository: logging-log4j2
Updated Branches:
refs/heads/master d59bb7137 -> 21ac645e0
[LOG4J2-1597]
Add a ScriptSelector Appender to create an Appender specified by a
Script. First cut. See failing
org.apache.logging.log4j.core.appender.ScriptSelectorAppenderTest. See
status logger output.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/79d9e113
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/79d9e113
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/79d9e113
Branch: refs/heads/master
Commit: 79d9e11373b8246c7725cbf5c115be4a4b7c05f0
Parents: 5599aed
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Sep 18 21:20:52 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Sep 18 21:20:52 2016 -0700
----------------------------------------------------------------------
.../log4j/core/appender/AppenderSet.java | 135 ++++++++++++++++++
.../log4j/core/appender/ScriptSelector.java | 139 +++++++++++++++++++
.../appender/ScriptSelectorAppenderTest.java | 95 +++++++++++++
.../log4j-appender-selector-javascript.xml | 35 +++++
4 files changed, 404 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/79d9e113/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
new file mode 100644
index 0000000..4403ab4
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
@@ -0,0 +1,135 @@
+/*
+ * 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.logging.log4j.core.appender;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.Node;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
+import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
+import org.apache.logging.log4j.core.config.plugins.PluginNode;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
+import org.apache.logging.log4j.status.StatusLogger;
+
+/**
+ * A deferred plugin for appenders.
+ */
+@Plugin(name = "AppenderSet", category = "Core", printObject = true, deferChildren = true)
+public class AppenderSet {
+
+ public static class Builder implements org.apache.logging.log4j.core.util.Builder<AppenderSet> {
+
+ @PluginNode
+ private Node node;
+
+ @PluginConfiguration
+ @Required
+ private Configuration configuration;
+
+ @Override
+ public AppenderSet build() {
+ if (configuration == null) {
+ LOGGER.error("Configuration is missing from AppenderNodeSet");
+ }
+ final List<Node> children = node.getChildren();
+ final Map<String, Node> map = new HashMap<>(node == null ? 0 : children.size());
+ if (children == null) {
+ LOGGER.error("No child node in the AppenderSet {}", this);
+ return null;
+ }
+ for (final Node childNode : children) {
+ final String key = childNode.getAttributes().get("name");
+ if (key == null) {
+ LOGGER.error("The attribute 'name' is missing from from the node {} in the AppenderNodeSet {}",
+ childNode, children);
+ } else {
+ map.put(key, childNode);
+ }
+ }
+ return new AppenderSet(configuration, map);
+ }
+
+ public Node getNode() {
+ return node;
+ }
+
+ public Configuration getConfiguration() {
+ return configuration;
+ }
+
+ public Builder withNode(@SuppressWarnings("hiding") final Node node) {
+ this.node = node;
+ return this;
+ }
+
+ public Builder withConfiguration(@SuppressWarnings("hiding") final Configuration configuration) {
+ this.configuration = configuration;
+ return this;
+ }
+
+ @Override
+ public String toString() {
+ return getClass().getName() + " [node=" + node + ", configuration=" + configuration + "]";
+ }
+
+ }
+
+ private static final StatusLogger LOGGER = StatusLogger.getLogger();
+
+ private final Configuration configuration;
+ private final Map<String, Node> nodeMap;
+
+ @PluginBuilderFactory
+ public static Builder newBuilder() {
+ return new Builder();
+ }
+
+ private AppenderSet(final Configuration configuration, final Map<String, Node> appenders) {
+ this.configuration = configuration;
+ this.nodeMap = appenders;
+ }
+
+ public Appender createAppender(final String appenderName) {
+ final Node node = nodeMap.get(appenderName);
+ if (node == null) {
+ LOGGER.error("No node named {} in {}", appenderName, this);
+ return null;
+ }
+ if (node.getType().getElementName().equals("appender")) {
+ final Node appNode = new Node(node);
+ configuration.createConfiguration(appNode, null);
+ if (appNode.getObject() instanceof Appender) {
+ final Appender app = appNode.getObject();
+ app.start();
+ return app;
+ }
+ LOGGER.error("Unable to create Appender of type " + node.getName());
+ return null;
+ }
+ LOGGER.error("No Appender was configured for name {} " + appenderName);
+ return null;
+ }
+
+ public Map<String, Node> getAppenders() {
+ return nodeMap;
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/79d9e113/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java
new file mode 100644
index 0000000..028f5b7
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java
@@ -0,0 +1,139 @@
+/*
+ * 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.logging.log4j.core.appender;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+import javax.script.Bindings;
+
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
+import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
+import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
+import org.apache.logging.log4j.core.config.plugins.PluginElement;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
+import org.apache.logging.log4j.core.script.AbstractScript;
+import org.apache.logging.log4j.core.script.ScriptManager;
+
+@Plugin(name = "ScriptSelector", category = "Core", elementType = "appender", printObject = true)
+public class ScriptSelector extends AbstractAppender {
+
+ /**
+ * Builds an appender.
+ */
+ public static final class Builder implements org.apache.logging.log4j.core.util.Builder<Appender> {
+
+ @PluginElement("AppenderSet")
+ @Required
+ private AppenderSet appenderSet;
+
+ @PluginConfiguration
+ @Required
+ private Configuration configuration;
+
+ @PluginBuilderAttribute
+ @Required
+ private String name;
+
+ @PluginElement("Script")
+ @Required
+ private AbstractScript script;
+
+ @Override
+ public Appender build() {
+ if (name == null) {
+ LOGGER.error("Name missing.");
+ }
+ if (script == null) {
+ LOGGER.error("Script missing for ScriptSelector appender {}", name);
+ }
+ if (appenderSet == null) {
+ LOGGER.error("AppenderSet missing for ScriptSelector appender {}", name);
+ }
+ if (configuration == null) {
+ LOGGER.error("Configuration missing for ScriptSelector appender {}", name);
+ }
+ final ScriptManager scriptManager = configuration.getScriptManager();
+ scriptManager.addScript(script);
+ final Bindings bindings = scriptManager.createBindings(script);
+ final Object object = scriptManager.execute(script.getName(), bindings);
+ final String appenderName = Objects.toString(object, null);
+ final Appender appender = appenderSet.createAppender(appenderName);
+ // This feels like a hack and it does not work:
+ configuration.getAppenders().put(name, appender);
+ return appender;
+ }
+
+ public AppenderSet getAppenderSet() {
+ return appenderSet;
+ }
+
+ public Configuration getConfiguration() {
+ return configuration;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public AbstractScript getScript() {
+ return script;
+ }
+
+ public Builder withAppenderNodeSet(@SuppressWarnings("hiding") final AppenderSet appenderSet) {
+ this.appenderSet = appenderSet;
+ return this;
+ }
+
+ public Builder withConfiguration(@SuppressWarnings("hiding") final Configuration configuration) {
+ this.configuration = configuration;
+ return this;
+ }
+
+ public Builder withName(@SuppressWarnings("hiding") final String name) {
+ this.name = name;
+ return this;
+ }
+
+ public Builder withScript(@SuppressWarnings("hiding") final AbstractScript script) {
+ this.script = script;
+ return this;
+ }
+
+ }
+
+ @PluginBuilderFactory
+ public static Builder newBuilder() {
+ return new Builder();
+ }
+
+ private ScriptSelector(final String name, final Filter filter, final Layout<? extends Serializable> layout) {
+ super(name, filter, layout);
+ }
+
+ @Override
+ public void append(final LogEvent event) {
+ // Do nothing: This appender is only used to discover and build another appender
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/79d9e113/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
new file mode 100644
index 0000000..3a037c0
--- /dev/null
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
@@ -0,0 +1,95 @@
+/*
+ * 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.logging.log4j.core.appender;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.MarkerManager;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.junit.LoggerContextRule;
+import org.apache.logging.log4j.test.appender.ListAppender;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+/**
+ *
+ */
+@RunWith(Parameterized.class)
+public class ScriptSelectorAppenderTest {
+
+ @Parameterized.Parameters(name = "{0} {1}")
+ public static Object[][] getParameters() {
+ // @formatter:off
+ return new Object[][] {
+ // { "log4j-appender-selector-groovy.xml" },
+ { "log4j-appender-selector-javascript.xml" },
+ };
+ // @formatter:on
+ }
+
+ @Rule
+ public final LoggerContextRule loggerContextRule;
+
+ public ScriptSelectorAppenderTest(final String configLocation) {
+ this.loggerContextRule = new LoggerContextRule(configLocation);
+ }
+
+ private ListAppender getListAppender() {
+ return loggerContextRule.getListAppender("List2");
+ }
+
+ private void logAndCheck() {
+ Marker marker = MarkerManager.getMarker("HEXDUMP");
+ final Logger logger = loggerContextRule.getLogger(ScriptSelectorAppenderTest.class);
+ logger.error("Hello");
+ final ListAppender listAppender = getListAppender();
+ final List<LogEvent> list = listAppender.getEvents();
+ assertNotNull("No events generated", list);
+ assertTrue("Incorrect number of events. Expected 1, got " + list.size(), list.size() == 1);
+ logger.error("World");
+ assertTrue("Incorrect number of events. Expected 2, got " + list.size(), list.size() == 2);
+ logger.error(marker, "DEADBEEF");
+ assertTrue("Incorrect number of events. Expected 3, got " + list.size(), list.size() == 3);
+ }
+
+ @Test(expected = AssertionError.class)
+ public void testAppenderAbsence() {
+ loggerContextRule.getListAppender("List1");
+ }
+
+ @Test
+ public void testAppenderPresence() {
+ getListAppender();
+ }
+
+ @Test
+ public void testLogging1() {
+ logAndCheck();
+ }
+
+ @Test
+ public void testLogging2() {
+ logAndCheck();
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/79d9e113/log4j-core/src/test/resources/log4j-appender-selector-javascript.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-appender-selector-javascript.xml b/log4j-core/src/test/resources/log4j-appender-selector-javascript.xml
new file mode 100644
index 0000000..f45e43c
--- /dev/null
+++ b/log4j-core/src/test/resources/log4j-appender-selector-javascript.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<Configuration status="WARN" name="RoutingTest">
+ <Appenders>
+ <ScriptSelector name="SelectIt">
+ <Script language="JavaScript"><![CDATA[
+ "OSNameFoo".search("Foo") > -1 ? "List2" : "List1";]]>
+ </Script>
+ <AppenderSet>
+ <List name="List1" />
+ <List name="List2" />
+ </AppenderSet>
+ </ScriptSelector>
+ </Appenders>
+ <Loggers>
+ <Root level="error">
+ <AppenderRef ref="SelectIt" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file
[9/9] logging-log4j2 git commit: [LOG4J2-1597]
Posted by gg...@apache.org.
[LOG4J2-1597]
Add a ScriptAppenderSelector to create an Appender specified by a
Script. Update changes.xml.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/21ac645e
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/21ac645e
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/21ac645e
Branch: refs/heads/master
Commit: 21ac645e0528b4f03ac7a448631ca1a8e341673b
Parents: f8482f1
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Sep 19 17:09:14 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Sep 19 17:09:14 2016 -0700
----------------------------------------------------------------------
src/changes/changes.xml | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/21ac645e/src/changes/changes.xml
----------------------------------------------------------------------
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
index 1698408..d48f10b 100644
--- a/src/changes/changes.xml
+++ b/src/changes/changes.xml
@@ -159,6 +159,9 @@
<action issue="LOG4J2-1578" dev="ggregory" type="add">
RoutingAppender can be configured with scripts. Add Script in a Routes element.
</action>
+ <action issue="LOG4J2-1597" dev="ggregory" type="add">
+ Add a ScriptAppenderSelector to create an Appender specified by a Script.
+ </action>
<action issue="LOG4J2-1349" dev="rpopma" type="add">
(GC) Added support for garbage-free ThreadContext map. Disabled by default, users need to enable this explicitly.
</action>
[7/9] logging-log4j2 git commit: [LOG4J2-1597] site docs.
Posted by gg...@apache.org.
[LOG4J2-1597] site docs.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cd570f83
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cd570f83
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cd570f83
Branch: refs/heads/master
Commit: cd570f830cecdee1df86a44494a831c5207b739a
Parents: ae159dc
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Sep 19 00:47:35 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Sep 19 00:47:35 2016 -0700
----------------------------------------------------------------------
src/site/site.xml | 1 +
src/site/xdoc/manual/appenders.xml | 34 +++++++++++++++++++++++++++++++++
2 files changed, 35 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd570f83/src/site/site.xml
----------------------------------------------------------------------
diff --git a/src/site/site.xml b/src/site/site.xml
index 9db99eb..a4da321 100644
--- a/src/site/site.xml
+++ b/src/site/site.xml
@@ -137,6 +137,7 @@
<item name="Rolling Random Access File" href="/manual/appenders.html#RollingRandomAccessFileAppender"/>
<item name="Routing" href="/manual/appenders.html#RoutingAppender"/>
<item name="SMTP" href="/manual/appenders.html#SMTPAppender"/>
+ <item name="ScriptSelector" href="/manual/appenders.html#ScriptSelector"/>
<item name="Socket" href="/manual/appenders.html#SocketAppender"/>
<item name="Syslog" href="/manual/appenders.html#SyslogAppender"/>
<item name="ZeroMQ/JeroMQ" href="/manual/appenders.html#JeroMQAppender"/>
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cd570f83/src/site/xdoc/manual/appenders.xml
----------------------------------------------------------------------
diff --git a/src/site/xdoc/manual/appenders.xml b/src/site/xdoc/manual/appenders.xml
index b82b716..5196f2e 100644
--- a/src/site/xdoc/manual/appenders.xml
+++ b/src/site/xdoc/manual/appenders.xml
@@ -3657,6 +3657,40 @@ public class JpaLogEntity extends AbstractLogEventWrapperEntity {
</Loggers>
</Configuration>]]></pre>
</subsection>
+ <a name="ScriptSelector"/>
+ <subsection name="ScriptSelector">
+ <p>
+ When the configuration is built, the <code>ScriptSelector</code> appender calls a <code>Script</code>
+ to compute an appender name. Log4j then creates one of the appender named listed under
+ <code>AppenderSet</code> using the name of the <code>ScriptSelector</code>. After configuration, Log4j
+ ignores the <code>ScriptSelector</code>. Log4j only builds the one selected appender from the
+ configuration tree, and ignores other <code>AppenderSet</code> child nodes.
+ </p>
+ <p>
+ In the following example, the script returns the name "List2". The appender name is recorded under
+ the name of the <code>ScriptSelector</code>, not the name of the selected appender, in this example,
+ "SelectIt".
+ </p>
+<pre class="prettyprint linenums"><![CDATA[<Configuration status="WARN" name="RoutingTest">
+ <Appenders>
+ <ScriptSelector name="SelectIt">
+ <Script language="JavaScript"><![CDATA[
+ importPackage(java.lang);
+ System.getProperty("os.name").search("Windows") ? "List2" : "List1";]]]]><![CDATA[>
+ </Script>
+ <AppenderSet>
+ <List name="List1" />
+ <List name="List2" />
+ </AppenderSet>
+ </ScriptSelector>
+ </Appenders>
+ <Loggers>
+ <Root level="error">
+ <AppenderRef ref="SelectIt" />
+ </Root>
+ </Loggers>
+</Configuration>]]></pre>
+ </subsection>
<a name="SocketAppender"/>
<subsection name="SocketAppender">
<p>
[4/9] logging-log4j2 git commit: [LOG4J2-1597] Remove unused method.
Posted by gg...@apache.org.
[LOG4J2-1597] Remove unused method.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/123448f5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/123448f5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/123448f5
Branch: refs/heads/master
Commit: 123448f596299bcb313d2e29c96dfe120072ed7f
Parents: 9a50278
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Sep 19 00:10:23 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Sep 19 00:10:23 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/appender/AppenderSet.java | 4 ----
1 file changed, 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/123448f5/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
index 472e456..b5fc59c 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
@@ -129,8 +129,4 @@ public class AppenderSet {
LOGGER.error("No Appender was configured for name {} " + appenderName);
return null;
}
-
- public Map<String, Node> getAppenders() {
- return nodeMap;
- }
}
[5/9] logging-log4j2 git commit: Fix status logger messages.
Posted by gg...@apache.org.
Fix status logger messages.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/6aab25f9
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/6aab25f9
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/6aab25f9
Branch: refs/heads/master
Commit: 6aab25f95809b8bf39e23cb0d1293c476623eb31
Parents: 123448f
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Sep 19 00:12:07 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Sep 19 00:12:07 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/logging/log4j/core/appender/AppenderSet.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/6aab25f9/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
index b5fc59c..6adf89f 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
@@ -48,7 +48,7 @@ public class AppenderSet {
@Override
public AppenderSet build() {
if (configuration == null) {
- LOGGER.error("Configuration is missing from AppenderNodeSet");
+ LOGGER.error("Configuration is missing from AppenderSet");
}
final List<Node> children = node.getChildren();
final Map<String, Node> map = new HashMap<>(node == null ? 0 : children.size());
@@ -59,7 +59,7 @@ public class AppenderSet {
for (final Node childNode : children) {
final String key = childNode.getAttributes().get("name");
if (key == null) {
- LOGGER.error("The attribute 'name' is missing from from the node {} in the AppenderNodeSet {}",
+ LOGGER.error("The attribute 'name' is missing from from the node {} in the AppenderSet {}",
childNode, children);
} else {
map.put(key, childNode);
[2/9] logging-log4j2 git commit: Overwrite the name in the Node's
attribute map.
Posted by gg...@apache.org.
Overwrite the name in the Node's attribute map.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c5ee9dc3
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c5ee9dc3
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c5ee9dc3
Branch: refs/heads/master
Commit: c5ee9dc34317a4cf832db977a20049f76f9405a1
Parents: 79d9e11
Author: Gary Gregory <gg...@apache.org>
Authored: Sun Sep 18 22:31:55 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Sun Sep 18 22:31:55 2016 -0700
----------------------------------------------------------------------
.../org/apache/logging/log4j/core/appender/AppenderSet.java | 3 ++-
.../apache/logging/log4j/core/appender/ScriptSelector.java | 4 +---
.../log4j/core/appender/ScriptSelectorAppenderTest.java | 9 +++++++--
3 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c5ee9dc3/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
index 4403ab4..472e456 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AppenderSet.java
@@ -108,12 +108,13 @@ public class AppenderSet {
this.nodeMap = appenders;
}
- public Appender createAppender(final String appenderName) {
+ public Appender createAppender(final String appenderName, String actualName) {
final Node node = nodeMap.get(appenderName);
if (node == null) {
LOGGER.error("No node named {} in {}", appenderName, this);
return null;
}
+ node.getAttributes().put("name", actualName);
if (node.getType().getElementName().equals("appender")) {
final Node appNode = new Node(node);
configuration.createConfiguration(appNode, null);
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c5ee9dc3/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java
index 028f5b7..0088abf 100644
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java
@@ -78,9 +78,7 @@ public class ScriptSelector extends AbstractAppender {
final Bindings bindings = scriptManager.createBindings(script);
final Object object = scriptManager.execute(script.getName(), bindings);
final String appenderName = Objects.toString(object, null);
- final Appender appender = appenderSet.createAppender(appenderName);
- // This feels like a hack and it does not work:
- configuration.getAppenders().put(name, appender);
+ final Appender appender = appenderSet.createAppender(appenderName, name);
return appender;
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c5ee9dc3/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
index 3a037c0..e1c8a14 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
@@ -56,7 +56,7 @@ public class ScriptSelectorAppenderTest {
}
private ListAppender getListAppender() {
- return loggerContextRule.getListAppender("List2");
+ return loggerContextRule.getListAppender("SelectIt");
}
private void logAndCheck() {
@@ -74,10 +74,15 @@ public class ScriptSelectorAppenderTest {
}
@Test(expected = AssertionError.class)
- public void testAppenderAbsence() {
+ public void testAppender1Absence() {
loggerContextRule.getListAppender("List1");
}
+ @Test(expected = AssertionError.class)
+ public void testAppender2Absence() {
+ loggerContextRule.getListAppender("List2");
+ }
+
@Test
public void testAppenderPresence() {
getListAppender();
[6/9] logging-log4j2 git commit: Merge remote-tracking branch
'origin/master' into LOG4J2-1597
Posted by gg...@apache.org.
Merge remote-tracking branch 'origin/master' into LOG4J2-1597
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/ae159dcf
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/ae159dcf
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/ae159dcf
Branch: refs/heads/master
Commit: ae159dcf8dbe6d1983223b953550aa98ddf88cf6
Parents: 6aab25f d59bb71
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Sep 19 00:16:09 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Sep 19 00:16:09 2016 -0700
----------------------------------------------------------------------
src/site/xdoc/manual/appenders.xml | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[8/9] logging-log4j2 git commit: [LOG4J2-1597] Rename
ScriptSelectorAppender to ScriptAppenderSelector.
Posted by gg...@apache.org.
[LOG4J2-1597] Rename ScriptSelectorAppender to ScriptAppenderSelector.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f8482f1b
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f8482f1b
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f8482f1b
Branch: refs/heads/master
Commit: f8482f1ba6c83c3345f247d396c62a853fe093e7
Parents: cd570f8
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Sep 19 17:06:51 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Sep 19 17:06:51 2016 -0700
----------------------------------------------------------------------
.../core/appender/ScriptAppenderSelector.java | 137 +++++++++++++++++++
.../log4j/core/appender/ScriptSelector.java | 137 -------------------
.../appender/ScriptAppenderSelectorTest.java | 100 ++++++++++++++
.../appender/ScriptSelectorAppenderTest.java | 100 --------------
.../log4j-appender-selector-groovy.xml | 4 +-
.../log4j-appender-selector-javascript.xml | 4 +-
6 files changed, 241 insertions(+), 241 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f8482f1b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
new file mode 100644
index 0000000..ae6da0a
--- /dev/null
+++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelector.java
@@ -0,0 +1,137 @@
+/*
+ * 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.logging.log4j.core.appender;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+import javax.script.Bindings;
+
+import org.apache.logging.log4j.core.Appender;
+import org.apache.logging.log4j.core.Filter;
+import org.apache.logging.log4j.core.Layout;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.config.Configuration;
+import org.apache.logging.log4j.core.config.plugins.Plugin;
+import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
+import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
+import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
+import org.apache.logging.log4j.core.config.plugins.PluginElement;
+import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
+import org.apache.logging.log4j.core.script.AbstractScript;
+import org.apache.logging.log4j.core.script.ScriptManager;
+
+@Plugin(name = "ScriptAppenderSelector", category = "Core", elementType = "appender", printObject = true)
+public class ScriptAppenderSelector extends AbstractAppender {
+
+ /**
+ * Builds an appender.
+ */
+ public static final class Builder implements org.apache.logging.log4j.core.util.Builder<Appender> {
+
+ @PluginElement("AppenderSet")
+ @Required
+ private AppenderSet appenderSet;
+
+ @PluginConfiguration
+ @Required
+ private Configuration configuration;
+
+ @PluginBuilderAttribute
+ @Required
+ private String name;
+
+ @PluginElement("Script")
+ @Required
+ private AbstractScript script;
+
+ @Override
+ public Appender build() {
+ if (name == null) {
+ LOGGER.error("Name missing.");
+ }
+ if (script == null) {
+ LOGGER.error("Script missing for ScriptAppenderSelector appender {}", name);
+ }
+ if (appenderSet == null) {
+ LOGGER.error("AppenderSet missing for ScriptAppenderSelector appender {}", name);
+ }
+ if (configuration == null) {
+ LOGGER.error("Configuration missing for ScriptAppenderSelector appender {}", name);
+ }
+ final ScriptManager scriptManager = configuration.getScriptManager();
+ scriptManager.addScript(script);
+ final Bindings bindings = scriptManager.createBindings(script);
+ final Object object = scriptManager.execute(script.getName(), bindings);
+ final String appenderName = Objects.toString(object, null);
+ final Appender appender = appenderSet.createAppender(appenderName, name);
+ return appender;
+ }
+
+ public AppenderSet getAppenderSet() {
+ return appenderSet;
+ }
+
+ public Configuration getConfiguration() {
+ return configuration;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public AbstractScript getScript() {
+ return script;
+ }
+
+ public Builder withAppenderNodeSet(@SuppressWarnings("hiding") final AppenderSet appenderSet) {
+ this.appenderSet = appenderSet;
+ return this;
+ }
+
+ public Builder withConfiguration(@SuppressWarnings("hiding") final Configuration configuration) {
+ this.configuration = configuration;
+ return this;
+ }
+
+ public Builder withName(@SuppressWarnings("hiding") final String name) {
+ this.name = name;
+ return this;
+ }
+
+ public Builder withScript(@SuppressWarnings("hiding") final AbstractScript script) {
+ this.script = script;
+ return this;
+ }
+
+ }
+
+ @PluginBuilderFactory
+ public static Builder newBuilder() {
+ return new Builder();
+ }
+
+ private ScriptAppenderSelector(final String name, final Filter filter, final Layout<? extends Serializable> layout) {
+ super(name, filter, layout);
+ }
+
+ @Override
+ public void append(final LogEvent event) {
+ // Do nothing: This appender is only used to discover and build another appender
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f8482f1b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java
deleted file mode 100644
index 0088abf..0000000
--- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ScriptSelector.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * 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.logging.log4j.core.appender;
-
-import java.io.Serializable;
-import java.util.Objects;
-
-import javax.script.Bindings;
-
-import org.apache.logging.log4j.core.Appender;
-import org.apache.logging.log4j.core.Filter;
-import org.apache.logging.log4j.core.Layout;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.config.Configuration;
-import org.apache.logging.log4j.core.config.plugins.Plugin;
-import org.apache.logging.log4j.core.config.plugins.PluginBuilderAttribute;
-import org.apache.logging.log4j.core.config.plugins.PluginBuilderFactory;
-import org.apache.logging.log4j.core.config.plugins.PluginConfiguration;
-import org.apache.logging.log4j.core.config.plugins.PluginElement;
-import org.apache.logging.log4j.core.config.plugins.validation.constraints.Required;
-import org.apache.logging.log4j.core.script.AbstractScript;
-import org.apache.logging.log4j.core.script.ScriptManager;
-
-@Plugin(name = "ScriptSelector", category = "Core", elementType = "appender", printObject = true)
-public class ScriptSelector extends AbstractAppender {
-
- /**
- * Builds an appender.
- */
- public static final class Builder implements org.apache.logging.log4j.core.util.Builder<Appender> {
-
- @PluginElement("AppenderSet")
- @Required
- private AppenderSet appenderSet;
-
- @PluginConfiguration
- @Required
- private Configuration configuration;
-
- @PluginBuilderAttribute
- @Required
- private String name;
-
- @PluginElement("Script")
- @Required
- private AbstractScript script;
-
- @Override
- public Appender build() {
- if (name == null) {
- LOGGER.error("Name missing.");
- }
- if (script == null) {
- LOGGER.error("Script missing for ScriptSelector appender {}", name);
- }
- if (appenderSet == null) {
- LOGGER.error("AppenderSet missing for ScriptSelector appender {}", name);
- }
- if (configuration == null) {
- LOGGER.error("Configuration missing for ScriptSelector appender {}", name);
- }
- final ScriptManager scriptManager = configuration.getScriptManager();
- scriptManager.addScript(script);
- final Bindings bindings = scriptManager.createBindings(script);
- final Object object = scriptManager.execute(script.getName(), bindings);
- final String appenderName = Objects.toString(object, null);
- final Appender appender = appenderSet.createAppender(appenderName, name);
- return appender;
- }
-
- public AppenderSet getAppenderSet() {
- return appenderSet;
- }
-
- public Configuration getConfiguration() {
- return configuration;
- }
-
- public String getName() {
- return name;
- }
-
- public AbstractScript getScript() {
- return script;
- }
-
- public Builder withAppenderNodeSet(@SuppressWarnings("hiding") final AppenderSet appenderSet) {
- this.appenderSet = appenderSet;
- return this;
- }
-
- public Builder withConfiguration(@SuppressWarnings("hiding") final Configuration configuration) {
- this.configuration = configuration;
- return this;
- }
-
- public Builder withName(@SuppressWarnings("hiding") final String name) {
- this.name = name;
- return this;
- }
-
- public Builder withScript(@SuppressWarnings("hiding") final AbstractScript script) {
- this.script = script;
- return this;
- }
-
- }
-
- @PluginBuilderFactory
- public static Builder newBuilder() {
- return new Builder();
- }
-
- private ScriptSelector(final String name, final Filter filter, final Layout<? extends Serializable> layout) {
- super(name, filter, layout);
- }
-
- @Override
- public void append(final LogEvent event) {
- // Do nothing: This appender is only used to discover and build another appender
- }
-
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f8482f1b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelectorTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelectorTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelectorTest.java
new file mode 100644
index 0000000..2e80467
--- /dev/null
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptAppenderSelectorTest.java
@@ -0,0 +1,100 @@
+/*
+ * 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.logging.log4j.core.appender;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
+import java.util.List;
+
+import org.apache.logging.log4j.Marker;
+import org.apache.logging.log4j.MarkerManager;
+import org.apache.logging.log4j.core.LogEvent;
+import org.apache.logging.log4j.core.Logger;
+import org.apache.logging.log4j.junit.LoggerContextRule;
+import org.apache.logging.log4j.test.appender.ListAppender;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
+
+/**
+ *
+ */
+@RunWith(Parameterized.class)
+public class ScriptAppenderSelectorTest {
+
+ @Parameterized.Parameters(name = "{0}")
+ public static Object[][] getParameters() {
+ // @formatter:off
+ return new Object[][] {
+ { "log4j-appender-selector-groovy.xml" },
+ { "log4j-appender-selector-javascript.xml" },
+ };
+ // @formatter:on
+ }
+
+ @Rule
+ public final LoggerContextRule loggerContextRule;
+
+ public ScriptAppenderSelectorTest(final String configLocation) {
+ this.loggerContextRule = new LoggerContextRule(configLocation);
+ }
+
+ private ListAppender getListAppender() {
+ return loggerContextRule.getListAppender("SelectIt");
+ }
+
+ private void logAndCheck() {
+ Marker marker = MarkerManager.getMarker("HEXDUMP");
+ final Logger logger = loggerContextRule.getLogger(ScriptAppenderSelectorTest.class);
+ logger.error("Hello");
+ final ListAppender listAppender = getListAppender();
+ final List<LogEvent> list = listAppender.getEvents();
+ assertNotNull("No events generated", list);
+ assertTrue("Incorrect number of events. Expected 1, got " + list.size(), list.size() == 1);
+ logger.error("World");
+ assertTrue("Incorrect number of events. Expected 2, got " + list.size(), list.size() == 2);
+ logger.error(marker, "DEADBEEF");
+ assertTrue("Incorrect number of events. Expected 3, got " + list.size(), list.size() == 3);
+ }
+
+ @Test(expected = AssertionError.class)
+ public void testAppender1Absence() {
+ loggerContextRule.getListAppender("List1");
+ }
+
+ @Test(expected = AssertionError.class)
+ public void testAppender2Absence() {
+ loggerContextRule.getListAppender("List2");
+ }
+
+ @Test
+ public void testAppenderPresence() {
+ getListAppender();
+ }
+
+ @Test
+ public void testLogging1() {
+ logAndCheck();
+ }
+
+ @Test
+ public void testLogging2() {
+ logAndCheck();
+ }
+}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f8482f1b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
deleted file mode 100644
index c5095c2..0000000
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * 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.logging.log4j.core.appender;
-
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-
-import java.util.List;
-
-import org.apache.logging.log4j.Marker;
-import org.apache.logging.log4j.MarkerManager;
-import org.apache.logging.log4j.core.LogEvent;
-import org.apache.logging.log4j.core.Logger;
-import org.apache.logging.log4j.junit.LoggerContextRule;
-import org.apache.logging.log4j.test.appender.ListAppender;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-
-/**
- *
- */
-@RunWith(Parameterized.class)
-public class ScriptSelectorAppenderTest {
-
- @Parameterized.Parameters(name = "{0}")
- public static Object[][] getParameters() {
- // @formatter:off
- return new Object[][] {
- { "log4j-appender-selector-groovy.xml" },
- { "log4j-appender-selector-javascript.xml" },
- };
- // @formatter:on
- }
-
- @Rule
- public final LoggerContextRule loggerContextRule;
-
- public ScriptSelectorAppenderTest(final String configLocation) {
- this.loggerContextRule = new LoggerContextRule(configLocation);
- }
-
- private ListAppender getListAppender() {
- return loggerContextRule.getListAppender("SelectIt");
- }
-
- private void logAndCheck() {
- Marker marker = MarkerManager.getMarker("HEXDUMP");
- final Logger logger = loggerContextRule.getLogger(ScriptSelectorAppenderTest.class);
- logger.error("Hello");
- final ListAppender listAppender = getListAppender();
- final List<LogEvent> list = listAppender.getEvents();
- assertNotNull("No events generated", list);
- assertTrue("Incorrect number of events. Expected 1, got " + list.size(), list.size() == 1);
- logger.error("World");
- assertTrue("Incorrect number of events. Expected 2, got " + list.size(), list.size() == 2);
- logger.error(marker, "DEADBEEF");
- assertTrue("Incorrect number of events. Expected 3, got " + list.size(), list.size() == 3);
- }
-
- @Test(expected = AssertionError.class)
- public void testAppender1Absence() {
- loggerContextRule.getListAppender("List1");
- }
-
- @Test(expected = AssertionError.class)
- public void testAppender2Absence() {
- loggerContextRule.getListAppender("List2");
- }
-
- @Test
- public void testAppenderPresence() {
- getListAppender();
- }
-
- @Test
- public void testLogging1() {
- logAndCheck();
- }
-
- @Test
- public void testLogging2() {
- logAndCheck();
- }
-}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f8482f1b/log4j-core/src/test/resources/log4j-appender-selector-groovy.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-appender-selector-groovy.xml b/log4j-core/src/test/resources/log4j-appender-selector-groovy.xml
index 4a15273..91ecfef 100644
--- a/log4j-core/src/test/resources/log4j-appender-selector-groovy.xml
+++ b/log4j-core/src/test/resources/log4j-appender-selector-groovy.xml
@@ -17,7 +17,7 @@
-->
<Configuration status="WARN" name="RoutingTest">
<Appenders>
- <ScriptSelector name="SelectIt">
+ <ScriptAppenderSelector name="SelectIt">
<Script language="groovy"><![CDATA[
return "OSNameFoo".contains("Foo") ? "List2": "List1";]]>
</Script>
@@ -25,7 +25,7 @@
<List name="List1" />
<List name="List2" />
</AppenderSet>
- </ScriptSelector>
+ </ScriptAppenderSelector>
</Appenders>
<Loggers>
<Root level="error">
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f8482f1b/log4j-core/src/test/resources/log4j-appender-selector-javascript.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-appender-selector-javascript.xml b/log4j-core/src/test/resources/log4j-appender-selector-javascript.xml
index f45e43c..6cc732b 100644
--- a/log4j-core/src/test/resources/log4j-appender-selector-javascript.xml
+++ b/log4j-core/src/test/resources/log4j-appender-selector-javascript.xml
@@ -17,7 +17,7 @@
-->
<Configuration status="WARN" name="RoutingTest">
<Appenders>
- <ScriptSelector name="SelectIt">
+ <ScriptAppenderSelector name="SelectIt">
<Script language="JavaScript"><![CDATA[
"OSNameFoo".search("Foo") > -1 ? "List2" : "List1";]]>
</Script>
@@ -25,7 +25,7 @@
<List name="List1" />
<List name="List2" />
</AppenderSet>
- </ScriptSelector>
+ </ScriptAppenderSelector>
</Appenders>
<Loggers>
<Root level="error">
[3/9] logging-log4j2 git commit: [LOG4J2-1597]
Posted by gg...@apache.org.
[LOG4J2-1597]
Add Groovy test to make sure all is well with any javax.script engine.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9a50278f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9a50278f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9a50278f
Branch: refs/heads/master
Commit: 9a50278fccd41a282bd3a2d641f1b4e7223c2f31
Parents: c5ee9dc
Author: Gary Gregory <gg...@apache.org>
Authored: Mon Sep 19 00:05:44 2016 -0700
Committer: Gary Gregory <gg...@apache.org>
Committed: Mon Sep 19 00:05:44 2016 -0700
----------------------------------------------------------------------
.../appender/ScriptSelectorAppenderTest.java | 4 +--
.../log4j-appender-selector-groovy.xml | 35 ++++++++++++++++++++
2 files changed, 37 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9a50278f/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
index e1c8a14..c5095c2 100644
--- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
+++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ScriptSelectorAppenderTest.java
@@ -38,11 +38,11 @@ import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
public class ScriptSelectorAppenderTest {
- @Parameterized.Parameters(name = "{0} {1}")
+ @Parameterized.Parameters(name = "{0}")
public static Object[][] getParameters() {
// @formatter:off
return new Object[][] {
- // { "log4j-appender-selector-groovy.xml" },
+ { "log4j-appender-selector-groovy.xml" },
{ "log4j-appender-selector-javascript.xml" },
};
// @formatter:on
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9a50278f/log4j-core/src/test/resources/log4j-appender-selector-groovy.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-appender-selector-groovy.xml b/log4j-core/src/test/resources/log4j-appender-selector-groovy.xml
new file mode 100644
index 0000000..4a15273
--- /dev/null
+++ b/log4j-core/src/test/resources/log4j-appender-selector-groovy.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<Configuration status="WARN" name="RoutingTest">
+ <Appenders>
+ <ScriptSelector name="SelectIt">
+ <Script language="groovy"><![CDATA[
+ return "OSNameFoo".contains("Foo") ? "List2": "List1";]]>
+ </Script>
+ <AppenderSet>
+ <List name="List1" />
+ <List name="List2" />
+ </AppenderSet>
+ </ScriptSelector>
+ </Appenders>
+ <Loggers>
+ <Root level="error">
+ <AppenderRef ref="SelectIt" />
+ </Root>
+ </Loggers>
+</Configuration>
\ No newline at end of file