svn commit: r974439 - /websites/production/logging/content/log4net/log4net-1.2.14/download_log4net.cgi
Author: coreyg Date: Thu Dec 3 20:13:08 2015 New Revision: 974439 Log: propset executable Modified: websites/production/logging/content/log4net/log4net-1.2.14/download_log4net.cgi (props changed) Propchange: websites/production/logging/content/log4net/log4net-1.2.14/download_log4net.cgi -- svn:executable = *
logging-log4j2 git commit: Formatting nit.
Repository: logging-log4j2
Updated Branches:
refs/heads/master fb3f9c6d9 -> 609a25b5b
Formatting nit.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/609a25b5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/609a25b5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/609a25b5
Branch: refs/heads/master
Commit: 609a25b5b199ab13dbb418c4347fec75f322d7ab
Parents: fb3f9c6
Author: Matt Sicker
Authored: Thu Dec 3 12:48:53 2015 -0600
Committer: Matt Sicker
Committed: Thu Dec 3 12:48:53 2015 -0600
--
.../org/apache/logging/log4j/core/config/AppendersPlugin.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/609a25b5/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppendersPlugin.java
--
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppendersPlugin.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppendersPlugin.java
index 879bfb0..fc939e9 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppendersPlugin.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/AppendersPlugin.java
@@ -42,11 +42,10 @@ public final class AppendersPlugin {
public static ConcurrentMap createAppenders(
@PluginElement("Appenders") final Appender[] appenders) {
-final ConcurrentMap map =
-new ConcurrentHashMap<>();
+final ConcurrentMap map = new ConcurrentHashMap<>();
for (final Appender appender : appenders) {
-map.put(appender.getName(), appender);
+map.put(appender.getName(), appender);
}
return map;
logging-log4j2 git commit: Update annotation processor to require Java 7.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 8f236d173 -> fb3f9c6d9
Update annotation processor to require Java 7.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fb3f9c6d
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fb3f9c6d
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fb3f9c6d
Branch: refs/heads/master
Commit: fb3f9c6d988b87ed2cb24bdb35bbc9cac250cf11
Parents: 8f236d1
Author: Matt Sicker
Authored: Thu Dec 3 12:46:29 2015 -0600
Committer: Matt Sicker
Committed: Thu Dec 3 12:46:29 2015 -0600
--
.../log4j/core/config/plugins/processor/PluginProcessor.java | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fb3f9c6d/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
--
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
index 2db7241..b0e7570 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/processor/PluginProcessor.java
@@ -25,7 +25,6 @@ import java.util.Collections;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
-
import javax.annotation.processing.AbstractProcessor;
import javax.annotation.processing.RoundEnvironment;
import javax.annotation.processing.SupportedAnnotationTypes;
@@ -34,7 +33,7 @@ import javax.lang.model.element.Element;
import javax.lang.model.element.ElementVisitor;
import javax.lang.model.element.TypeElement;
import javax.lang.model.util.Elements;
-import javax.lang.model.util.SimpleElementVisitor6;
+import javax.lang.model.util.SimpleElementVisitor7;
import javax.tools.Diagnostic.Kind;
import javax.tools.FileObject;
import javax.tools.StandardLocation;
@@ -116,7 +115,7 @@ public class PluginProcessor extends AbstractProcessor {
/**
* ElementVisitor to scan the Plugin annotation.
*/
-private static class PluginElementVisitor extends
SimpleElementVisitor6 {
+private static class PluginElementVisitor extends
SimpleElementVisitor7 {
private final Elements elements;
@@ -141,7 +140,7 @@ public class PluginProcessor extends AbstractProcessor {
/**
* ElementVisitor to scan the PluginAliases annotation.
*/
-private static class PluginAliasesElementVisitor extends
SimpleElementVisitor6, Plugin> {
+private static class PluginAliasesElementVisitor extends
SimpleElementVisitor7, Plugin> {
private final Elements elements;
logging-log4j2 git commit: Collapse catch blocks.
Repository: logging-log4j2
Updated Branches:
refs/heads/master 56516ea91 -> 8f236d173
Collapse catch blocks.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/8f236d17
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/8f236d17
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/8f236d17
Branch: refs/heads/master
Commit: 8f236d173282fa0deeaa90c0b20d50dfd3a72ffb
Parents: 56516ea
Author: Matt Sicker
Authored: Thu Dec 3 11:03:41 2015 -0600
Committer: Matt Sicker
Committed: Thu Dec 3 11:03:41 2015 -0600
--
.../logging/log4j/core/config/plugins/util/ResolverUtil.java | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/8f236d17/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
--
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
index 227e451..b198490 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/config/plugins/util/ResolverUtil.java
@@ -206,10 +206,8 @@ public class ResolverUtil {
loadImplementationsInJar(test, packageName, file);
}
}
-} catch (final IOException ioe) {
+} catch (final IOException | URISyntaxException ioe) {
LOGGER.warn("could not read entries", ioe);
-} catch (final URISyntaxException e) {
-LOGGER.warn("could not read entries", e);
}
}
}
[4/5] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-649
Merge branch 'master' into LOG4J2-649 Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cc267059 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cc267059 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cc267059 Branch: refs/heads/master Commit: cc2670593c4b68d34b61d9167f8ac73837a6f05f Parents: 13bb3d9 b6c67b4 Author: Mikael Ståldal Authored: Thu Dec 3 10:54:25 2015 +0100 Committer: Mikael Ståldal Committed: Thu Dec 3 10:54:25 2015 +0100 -- .../appender/AbstractOutputStreamAppender.java | 14 +++- .../log4j/core/appender/ConsoleAppender.java| 58 ++--- .../log4j/core/appender/SocketAppender.java | 85 ++-- .../core/appender/ConsoleAppenderTest.java | 14 ++-- .../log4j/core/appender/SocketAppenderTest.java | 31 --- .../net/server/AbstractSocketServerTest.java| 10 +-- .../core/net/server/SslXmlSocketServerTest.java | 4 +- 7 files changed, 133 insertions(+), 83 deletions(-) --
[3/5] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-649
Merge branch 'master' into LOG4J2-649 Conflicts: log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/13bb3d9f Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/13bb3d9f Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/13bb3d9f Branch: refs/heads/master Commit: 13bb3d9fa7ac975f59f912d27aae6077e5d9f646 Parents: 673b1f9 5a14032 Author: Mikael Ståldal Authored: Wed Dec 2 10:42:49 2015 +0100 Committer: Mikael Ståldal Committed: Wed Dec 2 10:42:49 2015 +0100 -- .../log4j/core/appender/HangingAppender.java | 17 +++-- 1 file changed, 15 insertions(+), 2 deletions(-) --
[5/5] logging-log4j2 git commit: Clean-up
Clean-up Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/56516ea9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/56516ea9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/56516ea9 Branch: refs/heads/master Commit: 56516ea91a466e151b10d3f64028f734d516bc05 Parents: cc26705 Author: Mikael Ståldal Authored: Thu Dec 3 10:56:57 2015 +0100 Committer: Mikael Ståldal Committed: Thu Dec 3 10:56:57 2015 +0100 -- .../appender/routing/RoutingAppenderWithPurgingTest.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56516ea9/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java -- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java index f3b2639..49ffabe 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java @@ -16,6 +16,11 @@ */ package org.apache.logging.log4j.core.appender.routing; +import static org.junit.Assert.*; + +import java.io.File; +import java.util.List; + import org.apache.logging.log4j.EventLogger; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.junit.CleanFiles; @@ -27,11 +32,6 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import java.io.File; -import java.util.List; - -import static org.junit.Assert.*; - /** * Testing Routing appender purge facilities */
[2/5] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-649
Merge branch 'master' into LOG4J2-649 Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/673b1f9b Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/673b1f9b Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/673b1f9b Branch: refs/heads/master Commit: 673b1f9b00b32b6f2f03129d7820dfade53dbd45 Parents: c672c93 1c786f6 Author: Mikael Ståldal Authored: Wed Dec 2 10:07:21 2015 +0100 Committer: Mikael Ståldal Committed: Wed Dec 2 10:07:21 2015 +0100 -- .../log4j/core/appender/SocketAppender.java | 97 .../apache/logging/log4j/core/net/Protocol.java | 4 +- .../log4j/core/appender/SocketAppenderTest.java | 9 +- .../net/server/AbstractSocketServerTest.java| 5 +- .../core/net/server/SslXmlSocketServerTest.java | 3 +- .../net/server/TcpJsonSocketServerTest.java | 3 +- .../server/TcpSerializedSocketServerTest.java | 3 +- .../core/net/server/TcpXmlSocketServerTest.java | 3 +- .../net/server/UdpJsonSocketServerTest.java | 3 +- .../server/UdpSerializedSocketServerTest.java | 3 +- .../core/net/server/UdpXmlSocketServerTest.java | 3 +- 11 files changed, 101 insertions(+), 35 deletions(-) --
[1/5] logging-log4j2 git commit: Make sure that IdlePurgePolicy can handle an appender which hang on shutdown
Repository: logging-log4j2
Updated Branches:
refs/heads/master b6c67b491 -> 56516ea91
Make sure that IdlePurgePolicy can handle an appender which hang on shutdown
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/c672c93f
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/c672c93f
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/c672c93f
Branch: refs/heads/master
Commit: c672c93fa5422103fb2e602520de09991a377f11
Parents: 7f64fe8
Author: Mikael Ståldal
Authored: Tue Dec 1 17:48:36 2015 +0100
Committer: Mikael Ståldal
Committed: Tue Dec 1 17:48:36 2015 +0100
--
.../log4j/core/appender/HangingAppender.java| 16 --
.../routing/RoutingAppenderWithPurgingTest.java | 23
.../src/test/resources/log4j-routing-purge.xml | 10 +
3 files changed, 38 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c672c93f/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
--
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
index a3ebbf0..1707388 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/HangingAppender.java
@@ -33,10 +33,12 @@ public class HangingAppender extends AbstractAppender {
private static final long serialVersionUID = 1L;
private final long delay;
+private final long shutdownDelay;
-public HangingAppender(final String name, final long delay) {
+public HangingAppender(final String name, final long delay, final long
shutdownDelay) {
super(name, null, null);
this.delay = delay;
+this.shutdownDelay = shutdownDelay;
}
@Override
@@ -54,9 +56,19 @@ public class HangingAppender extends AbstractAppender {
@Required(message = "No name provided for HangingAppender")
final String name,
@PluginAttribute("delay") final long delay,
+@PluginAttribute("shutdownDelay") final long shutdownDelay,
@PluginElement("Layout") final Layout
layout,
@PluginElement("Filter") final Filter filter) {
-return new HangingAppender(name, delay);
+return new HangingAppender(name, delay, shutdownDelay);
}
+@Override
+public void stop() {
+super.stop();
+try {
+Thread.sleep(shutdownDelay);
+} catch (InterruptedException ignore) {
+// ignore
+}
+}
}
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/c672c93f/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
--
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
index 1c3df3d..f3b2639 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java
@@ -16,11 +16,6 @@
*/
package org.apache.logging.log4j.core.appender.routing;
-import static org.junit.Assert.*;
-
-import java.io.File;
-import java.util.List;
-
import org.apache.logging.log4j.EventLogger;
import org.apache.logging.log4j.core.LogEvent;
import org.apache.logging.log4j.junit.CleanFiles;
@@ -32,6 +27,11 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
+import java.io.File;
+import java.util.List;
+
+import static org.junit.Assert.*;
+
/**
* Testing Routing appender purge facilities
*/
@@ -47,6 +47,7 @@ public class RoutingAppenderWithPurgingTest {
private ListAppender app;
private RoutingAppender routingAppenderIdle;
+private RoutingAppender routingAppenderIdleWithHangingAppender;
private RoutingAppender routingAppenderManual;
@Rule
@@ -61,6 +62,8 @@ public class RoutingAppenderWithPurgingTest {
public void setUp() throws Exception {
this.app = this.init.getListAppender("List");
this.routingAppenderIdle =
this.init.getRequiredAppender("RoutingPurgeIdle", RoutingAppender.class);
+this.routingAppenderIdleWithHangingAppender =
+
this.init.getRequiredAppender("RoutingPurgeIdleWithHangingAppender",
RoutingAppender.class);
logging-log4j2 git commit: Clean-up
Repository: logging-log4j2 Updated Branches: refs/heads/LOG4J2-649 cc2670593 -> 56516ea91 Clean-up Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/56516ea9 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/56516ea9 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/56516ea9 Branch: refs/heads/LOG4J2-649 Commit: 56516ea91a466e151b10d3f64028f734d516bc05 Parents: cc26705 Author: Mikael Ståldal Authored: Thu Dec 3 10:56:57 2015 +0100 Committer: Mikael Ståldal Committed: Thu Dec 3 10:56:57 2015 +0100 -- .../appender/routing/RoutingAppenderWithPurgingTest.java | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/56516ea9/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java -- diff --git a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java index f3b2639..49ffabe 100644 --- a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java +++ b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/routing/RoutingAppenderWithPurgingTest.java @@ -16,6 +16,11 @@ */ package org.apache.logging.log4j.core.appender.routing; +import static org.junit.Assert.*; + +import java.io.File; +import java.util.List; + import org.apache.logging.log4j.EventLogger; import org.apache.logging.log4j.core.LogEvent; import org.apache.logging.log4j.junit.CleanFiles; @@ -27,11 +32,6 @@ import org.junit.Before; import org.junit.Rule; import org.junit.Test; -import java.io.File; -import java.util.List; - -import static org.junit.Assert.*; - /** * Testing Routing appender purge facilities */
[02/14] logging-log4j2 git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/logging-log4j2.git Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fe4ace50 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fe4ace50 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fe4ace50 Branch: refs/heads/LOG4J2-649 Commit: fe4ace50c91384ae6fc7c3314a5669aabb5db6ae Parents: 9ef298b 5a14032 Author: ggregory Authored: Wed Dec 2 07:52:58 2015 -0800 Committer: ggregory Committed: Wed Dec 2 07:52:58 2015 -0800 -- .../log4j/core/appender/HangingAppender.java| 29 ++-- 1 file changed, 27 insertions(+), 2 deletions(-) --
[05/14] logging-log4j2 git commit: Javadoc tweak.
Javadoc tweak.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/2566efa6
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/2566efa6
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/2566efa6
Branch: refs/heads/LOG4J2-649
Commit: 2566efa635d6930b9ba0b002689fc9aab9b5eb4f
Parents: fb5842a
Author: ggregory
Authored: Wed Dec 2 08:18:04 2015 -0800
Committer: ggregory
Committed: Wed Dec 2 08:18:04 2015 -0800
--
.../logging/log4j/core/appender/AbstractOutputStreamAppender.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/2566efa6/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
--
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
index 3e09a61..5720974 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
@@ -48,7 +48,7 @@ public abstract class AbstractOutputStreamAppenderos as its {@link java.io.OutputStream}.
*
* @param name The name of the Appender.
[09/14] logging-log4j2 git commit: New SocketAppender factory API is now type safe.
New SocketAppender factory API is now type safe. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/85aed0c3 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/85aed0c3 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/85aed0c3 Branch: refs/heads/LOG4J2-649 Commit: 85aed0c35fbddd0fae64d9d1aabfceb6fe8eaa90 Parents: cb3d35e Author: ggregory Authored: Wed Dec 2 16:29:05 2015 -0800 Committer: ggregory Committed: Wed Dec 2 16:29:05 2015 -0800 -- .../logging/log4j/core/appender/SocketAppender.java | 11 +-- 1 file changed, 9 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/85aed0c3/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java -- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java index cda19e4..4212613 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java @@ -201,8 +201,15 @@ public class SocketAppender extends AbstractOutputStreamAppender
[06/14] logging-log4j2 git commit: Encapsulate immediate flush.
Encapsulate immediate flush.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/358c4579
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/358c4579
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/358c4579
Branch: refs/heads/LOG4J2-649
Commit: 358c4579bab52a15844a0f17f6e3b64cfdea880f
Parents: 2566efa
Author: ggregory
Authored: Wed Dec 2 08:35:47 2015 -0800
Committer: ggregory
Committed: Wed Dec 2 08:35:47 2015 -0800
--
.../core/appender/AbstractOutputStreamAppender.java | 12 +++-
1 file changed, 11 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/358c4579/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
--
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
index 5720974..5ab28d5 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/AbstractOutputStreamAppender.java
@@ -40,7 +40,7 @@ public abstract class AbstractOutputStreamAppenderimmediateFlush is set to {@code false}, then there is a
good chance that the last few logs events
* are not actually written to persistent media if and when the
application crashes.
*/
-protected final boolean immediateFlush;
+private final boolean immediateFlush;
private final M manager;
@@ -63,6 +63,15 @@ public abstract class AbstractOutputStreamAppender
[13/14] logging-log4j2 git commit: Fix tests I broke earlier.
Fix tests I broke earlier.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/b6c67b49
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/b6c67b49
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/b6c67b49
Branch: refs/heads/LOG4J2-649
Commit: b6c67b491bbac7a747e05db773ddd234673eab3f
Parents: 4579f14
Author: ggregory
Authored: Wed Dec 2 22:47:55 2015 -0800
Committer: ggregory
Committed: Wed Dec 2 22:47:55 2015 -0800
--
.../apache/logging/log4j/core/appender/SocketAppenderTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/b6c67b49/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
--
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 21bf250..5e4a556 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -71,7 +71,7 @@ public class SocketAppenderTest {
@BeforeClass
public static void setupClass() throws Exception {
-tcpServer = new
TCPSocketServer(AvailablePortFinder.getNextAvailable());
+tcpServer = new TCPSocketServer(PORT);
tcpServer.start();
udpServer = new UDPSocketServer();
udpServer.start();
@@ -175,7 +175,7 @@ public class SocketAppenderTest {
root.setAdditive(false);
root.setLevel(Level.DEBUG);
-new TCPSocketServer(AvailablePortFinder.getNextAvailable()).start();
+new TCPSocketServer(DYN_PORT).start();
root.debug("This message is written because a deadlock never.");
@@ -209,7 +209,7 @@ public class SocketAppenderTest {
private Thread thread;
public UDPSocketServer() throws IOException {
-this.sock = new
DatagramSocket(AvailablePortFinder.getNextAvailable());
+this.sock = new DatagramSocket(PORT);
}
public void shutdown() {
[10/14] logging-log4j2 git commit: Add ConsoleAppender.getTarget().
Add ConsoleAppender.getTarget().
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/441b3933
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/441b3933
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/441b3933
Branch: refs/heads/LOG4J2-649
Commit: 441b393311bbbf832249099d6eaf907d9a6d1591
Parents: 85aed0c
Author: ggregory
Authored: Wed Dec 2 21:27:48 2015 -0800
Committer: ggregory
Committed: Wed Dec 2 21:27:48 2015 -0800
--
.../logging/log4j/core/appender/ConsoleAppender.java | 15 +++
.../log4j/core/appender/ConsoleAppenderTest.java | 4 +++-
2 files changed, 14 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/441b3933/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
--
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
index 0466485..82a97d9 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
@@ -57,6 +57,8 @@ public final class ConsoleAppender extends
AbstractOutputStreamAppender layout, final Filter filter,
-final OutputStreamManager manager, final boolean ignoreExceptions)
{
+final OutputStreamManager manager, final boolean ignoreExceptions,
Target target) {
super(name, layout, filter, ignoreExceptions, true, manager);
+this.target = target;
}
/**
@@ -101,13 +104,13 @@ public final class ConsoleAppender extends
AbstractOutputStreamAppender layout) {
// this method cannot use the builder class without introducing an
infinite loop due to DefaultConfiguration
return new ConsoleAppender("DefaultConsole-" +
COUNT.incrementAndGet(), layout, null,
-getDefaultManager(DEFAULT_TARGET, false, layout), true);
+getDefaultManager(DEFAULT_TARGET, false, layout), true,
DEFAULT_TARGET);
}
@PluginBuilderFactory
@@ -173,7 +176,7 @@ public final class ConsoleAppender extends
AbstractOutputStreamAppenderhttp://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/441b3933/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
--
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
index 16417b9..317fc17 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
@@ -19,7 +19,6 @@ package org.apache.logging.log4j.core.appender;
import static org.easymock.EasyMock.anyInt;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.expectLastCall;
-
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
@@ -37,10 +36,12 @@ import org.apache.logging.log4j.core.util.Constants;
import org.apache.logging.log4j.message.SimpleMessage;
import org.easymock.EasyMockSupport;
import org.junit.AfterClass;
+import org.junit.Assert;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+
/**
*
*/
@@ -133,6 +134,7 @@ public class ConsoleAppenderTest {
private void testFollowSystemPrintStream(final PrintStream ps, final
Target target, final SystemSetter systemSetter) {
final ConsoleAppender app =
ConsoleAppender.newBuilder().setTarget(target).setFollow(true)
.setIgnoreExceptions(false).build();
+Assert.assertEquals(target, app.getTarget());
app.start();
try {
final LogEvent event = Log4jLogEvent.newBuilder() //
[11/14] logging-log4j2 git commit: New SocketAppender factory API is now type safe. Clean ups.
New SocketAppender factory API is now type safe. Clean ups.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9101f80a
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9101f80a
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9101f80a
Branch: refs/heads/LOG4J2-649
Commit: 9101f80ae8f35163bca86e3a91fe9a95ad9c68d5
Parents: 441b393
Author: ggregory
Authored: Wed Dec 2 21:49:47 2015 -0800
Committer: ggregory
Committed: Wed Dec 2 21:49:47 2015 -0800
--
.../log4j/core/appender/SocketAppender.java | 30 ++--
1 file changed, 15 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9101f80a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
--
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 4212613..9c21d4a 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -185,21 +185,21 @@ public class SocketAppender extends
AbstractOutputStreamAppender layout,
-@PluginElement("Filter") final Filter filter,
-@PluginAttribute("advertise") final String advertise,
-@PluginConfiguration final Configuration config) {
+final String host,
+final String portNum,
+final String protocolIn,
+final SslConfiguration sslConfig,
+final int connectTimeoutMillis,
+// deprecated
+final String delayMillis,
+final String immediateFail,
+final String name,
+final String immediateFlush,
+final String ignore,
+Layout layout,
+final Filter filter,
+final String advertise,
+final Configuration config) {
// @formatter:on
boolean isFlush = Booleans.parseBoolean(immediateFlush, true);
final boolean isAdvertise = Boolean.parseBoolean(advertise);
[04/14] logging-log4j2 git commit: Remove unused imports.
Remove unused imports. Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/fb5842a5 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/fb5842a5 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/fb5842a5 Branch: refs/heads/LOG4J2-649 Commit: fb5842a54134682d0411cb32489586c1cf5eaf97 Parents: f52b7bf Author: ggregory Authored: Wed Dec 2 07:56:39 2015 -0800 Committer: ggregory Committed: Wed Dec 2 07:56:39 2015 -0800 -- .../java/org/apache/logging/log4j/core/appender/SocketAppender.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/fb5842a5/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java -- diff --git a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java index ba6774f..89410c6 100644 --- a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java +++ b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java @@ -38,7 +38,6 @@ import org.apache.logging.log4j.core.net.SslSocketManager; import org.apache.logging.log4j.core.net.TcpSocketManager; import org.apache.logging.log4j.core.net.ssl.SslConfiguration; import org.apache.logging.log4j.core.util.Booleans; -import org.apache.logging.log4j.util.EnglishEnums; /** * An Appender that delivers events over socket connections. Supports both TCP and UDP.
[12/14] logging-log4j2 git commit: New ConsoleAppender factory method is type safe, old method is deprecated.
New ConsoleAppender factory method is type safe, old method is
deprecated.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/4579f143
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/4579f143
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/4579f143
Branch: refs/heads/LOG4J2-649
Commit: 4579f143958771e3f26d2b8dad944bb0e899bf54
Parents: 9101f80
Author: ggregory
Authored: Wed Dec 2 22:22:22 2015 -0800
Committer: ggregory
Committed: Wed Dec 2 22:22:22 2015 -0800
--
.../log4j/core/appender/ConsoleAppender.java| 45 +---
.../core/appender/ConsoleAppenderTest.java | 10 ++---
2 files changed, 43 insertions(+), 12 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4579f143/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
--
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
index 82a97d9..10abd72 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/ConsoleAppender.java
@@ -86,14 +86,15 @@ public final class ConsoleAppender extends
AbstractOutputStreamAppender layout,
-@PluginElement("Filter") final Filter filter,
-@PluginAttribute(value = "target", defaultString = "SYSTEM_OUT")
final String targetStr,
-@PluginAttribute("name") final String name,
-@PluginAttribute(value = "follow", defaultBoolean = false) final
String follow,
-@PluginAttribute(value = "ignoreExceptions", defaultBoolean =
true) final String ignore) {
+@Deprecated
+public static ConsoleAppender createAppender(Layout layout,
+final Filter filter,
+final String targetStr,
+final String name,
+final String follow,
+final String ignore) {
if (name == null) {
LOGGER.error("No name provided for ConsoleAppender");
return null;
@@ -107,6 +108,36 @@ public final class ConsoleAppender extends
AbstractOutputStreamAppender layout,
+@PluginElement("Filter") final Filter filter,
+@PluginAttribute(value = "target") Target target,
+@PluginAttribute("name") final String name,
+@PluginAttribute(value = "follow", defaultBoolean = false) final
boolean follow,
+@PluginAttribute(value = "ignoreExceptions", defaultBoolean =
true) final boolean ignoreExceptions) {
+if (name == null) {
+LOGGER.error("No name provided for ConsoleAppender");
+return null;
+}
+if (layout == null) {
+layout = PatternLayout.createDefaultLayout();
+}
+target = target == null ? Target.SYSTEM_OUT : target;
+return new ConsoleAppender(name, layout, filter, getManager(target,
follow, layout), ignoreExceptions, target);
+}
+
public static ConsoleAppender createDefaultAppenderForLayout(final
Layout layout) {
// this method cannot use the builder class without introducing an
infinite loop due to DefaultConfiguration
return new ConsoleAppender("DefaultConsole-" +
COUNT.incrementAndGet(), layout, null,
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/4579f143/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
--
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
index 317fc17..65b3e2e 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/ConsoleAppenderTest.java
@@ -90,7 +90,7 @@ public class ConsoleAppenderTest {
abstract void systemSet(PrintStream printStream);
}
-private void testConsoleStreamManagerDoesNotClose(final PrintStream ps,
final String targetName, final SystemSetter systemSetter) {
+private void testConsoleStreamManagerDoesNotClose(final PrintStream ps,
final Target targetName, final SystemSetter systemSetter) {
try {
psMock.write((byte[]) anyObject(), anyInt(), anyInt());
expectLastCall().anyTimes();
@@ -100,8 +100,8 @@ public class ConsoleAppenderTest {
mocks.replayAll();
systemSetter.systemSet(psMock);
final Layout layou
[01/14] logging-log4j2 git commit: Replace String protocol method with type-safe enum Protocol.
Repository: logging-log4j2
Updated Branches:
refs/heads/LOG4J2-649 13bb3d9fa -> cc2670593
Replace String protocol method with type-safe enum Protocol.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/9ef298b5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/9ef298b5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/9ef298b5
Branch: refs/heads/LOG4J2-649
Commit: 9ef298b5c82471944ab3c5508578c5752e0e7f60
Parents: 1c786f6
Author: ggregory
Authored: Wed Dec 2 07:52:39 2015 -0800
Committer: ggregory
Committed: Wed Dec 2 07:52:39 2015 -0800
--
.../org/apache/logging/log4j/core/appender/SocketAppenderTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/9ef298b5/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
--
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 150ae70..9a7f9d5 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -144,7 +144,7 @@ public class SocketAppenderTest {
@Test
public void testDefaultProtocol() throws Exception {
-final SocketAppender appender =
SocketAppender.createAppender("localhost", PORT, null, null, 0, "-1",
+final SocketAppender appender =
SocketAppender.createAppender("localhost", PORT, (Protocol) null, null, 0, "-1",
"false", "Test", null, null, null, null, null, null);
assertNotNull(appender);
}
[03/14] logging-log4j2 git commit: Format.
Format.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/f52b7bf2
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/f52b7bf2
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/f52b7bf2
Branch: refs/heads/LOG4J2-649
Commit: f52b7bf20a3609ba9cd460326304f680b477
Parents: fe4ace5
Author: ggregory
Authored: Wed Dec 2 07:56:03 2015 -0800
Committer: ggregory
Committed: Wed Dec 2 07:56:03 2015 -0800
--
.../org/apache/logging/log4j/core/appender/SocketAppender.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/f52b7bf2/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
--
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 9b2ec0d..ba6774f 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -123,7 +123,8 @@ public class SocketAppender extends
AbstractOutputStreamAppender layout,
@PluginElement("Filter") final Filter filter,
-@PluginAttribute("advertise") final String advertise,
@PluginConfiguration final Configuration config) {
+@PluginAttribute("advertise") final String advertise,
+@PluginConfiguration final Configuration config) {
// @formatter:on
boolean isFlush = Booleans.parseBoolean(immediateFlush, true);
final boolean isAdvertise = Boolean.parseBoolean(advertise);
@@ -203,7 +204,8 @@ public class SocketAppender extends
AbstractOutputStreamAppender layout,
@PluginElement("Filter") final Filter filter,
-@PluginAttribute("advertise") final String advertise,
@PluginConfiguration final Configuration config) {
+@PluginAttribute("advertise") final String advertise,
+@PluginConfiguration final Configuration config) {
// @formatter:on
return createAppender(host, portNum, protocolIn, sslConfig,
connectTimeoutMillis, delayMillis, immediateFail,
name, immediateFlush, ignore, layout, filter, advertise,
config);
[07/14] logging-log4j2 git commit: New SocketAppender factory API is now type safe.
New SocketAppender factory API is now type safe.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/d49c49fd
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/d49c49fd
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/d49c49fd
Branch: refs/heads/LOG4J2-649
Commit: d49c49fd65720f04c5d0c29c5747174697457e80
Parents: 358c457
Author: ggregory
Authored: Wed Dec 2 09:21:11 2015 -0800
Committer: ggregory
Committed: Wed Dec 2 09:21:11 2015 -0800
--
.../log4j/core/appender/SocketAppender.java | 43 +---
.../log4j/core/appender/SocketAppenderTest.java | 22 +-
.../net/server/AbstractSocketServerTest.java| 10 ++---
.../core/net/server/SslXmlSocketServerTest.java | 4 +-
4 files changed, 37 insertions(+), 42 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d49c49fd/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
--
diff --git
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
index 89410c6..cda19e4 100644
---
a/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
+++
b/log4j-core/src/main/java/org/apache/logging/log4j/core/appender/SocketAppender.java
@@ -77,15 +77,15 @@ public class SocketAppender extends
AbstractOutputStreamAppender layout,
@PluginElement("Filter") final Filter filter,
-@PluginAttribute("advertise") final String advertise,
+@PluginAttribute(value = "advertise", defaultBoolean = false)
final boolean advertise,
@PluginConfiguration final Configuration config) {
// @formatter:on
-boolean isFlush = Booleans.parseBoolean(immediateFlush, true);
-final boolean isAdvertise = Boolean.parseBoolean(advertise);
-final boolean ignoreExceptions = Booleans.parseBoolean(ignore, true);
-final boolean fail = Booleans.parseBoolean(immediateFail, true);
-final int reconnectDelayMillis =
AbstractAppender.parseInt(delayMillis, 0);
-final int port = AbstractAppender.parseInt(portNum, 0);
+
if (layout == null) {
layout = SerializedLayout.createLayout();
}
@@ -140,16 +135,16 @@ public class SocketAppender extends
AbstractOutputStreamAppenderhttp://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/d49c49fd/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
--
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 9a7f9d5..87b06cb 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -57,9 +57,9 @@ public class SocketAppenderTest {
private static final int PORTNUM1 = AvailablePortFinder.getNextAvailable();
private static final int PORTNUM2 = AvailablePortFinder.getNextAvailable();
-private static final String PORT = String.valueOf(PORTNUM1);
-private static final String DYN_PORT = String.valueOf(PORTNUM2);
-private static final String ERROR_PORT =
String.valueOf(AvailablePortFinder.getNextAvailable());
+private static final int PORT = PORTNUM1;
+private static final int DYN_PORT = PORTNUM2;
+private static final int ERROR_PORT =
AvailablePortFinder.getNextAvailable();
private static BlockingQueue list = new ArrayBlockingQueue<>(10);
@@ -104,8 +104,8 @@ public class SocketAppenderTest {
@Test
public void testTcpAppender() throws Exception {
-final SocketAppender appender =
SocketAppender.createAppender("localhost", PORT, Protocol.TCP, null, 0, "-1",
-"false", "Test", null, null, null, null, null, null);
+final SocketAppender appender =
SocketAppender.createAppender("localhost", PORT, Protocol.TCP, null, 0, -1,
+false, "Test", true, true, null, null, false, null);
appender.start();
// set appender on root and set level to debug
@@ -144,16 +144,16 @@ public class SocketAppenderTest {
@Test
public void testDefaultProtocol() throws Exception {
-final SocketAppender appender =
SocketAppender.createAppender("localhost", PORT, (Protocol) null, null, 0, "-1",
-"false", "Test", null, null, null, null, null, null);
+final SocketAppender appender =
Socke
[08/14] logging-log4j2 git commit: Test clean ups.
Test clean ups.
Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cb3d35e5
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cb3d35e5
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cb3d35e5
Branch: refs/heads/LOG4J2-649
Commit: cb3d35e572869b815766b9eb5986293fc5f3426f
Parents: d49c49f
Author: ggregory
Authored: Wed Dec 2 09:21:49 2015 -0800
Committer: ggregory
Committed: Wed Dec 2 09:21:49 2015 -0800
--
.../log4j/core/appender/SocketAppenderTest.java| 13 +
1 file changed, 5 insertions(+), 8 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/cb3d35e5/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
--
diff --git
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
index 87b06cb..21bf250 100644
---
a/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
+++
b/log4j-core/src/test/java/org/apache/logging/log4j/core/appender/SocketAppenderTest.java
@@ -54,11 +54,8 @@ import org.junit.Test;
*/
public class SocketAppenderTest {
-private static final int PORTNUM1 = AvailablePortFinder.getNextAvailable();
-private static final int PORTNUM2 = AvailablePortFinder.getNextAvailable();
-
-private static final int PORT = PORTNUM1;
-private static final int DYN_PORT = PORTNUM2;
+private static final int PORT = AvailablePortFinder.getNextAvailable();
+private static final int DYN_PORT = AvailablePortFinder.getNextAvailable();
private static final int ERROR_PORT =
AvailablePortFinder.getNextAvailable();
private static BlockingQueue list = new ArrayBlockingQueue<>(10);
@@ -74,7 +71,7 @@ public class SocketAppenderTest {
@BeforeClass
public static void setupClass() throws Exception {
-tcpServer = new TCPSocketServer(PORTNUM1);
+tcpServer = new
TCPSocketServer(AvailablePortFinder.getNextAvailable());
tcpServer.start();
udpServer = new UDPSocketServer();
udpServer.start();
@@ -178,7 +175,7 @@ public class SocketAppenderTest {
root.setAdditive(false);
root.setLevel(Level.DEBUG);
-new TCPSocketServer(PORTNUM2).start();
+new TCPSocketServer(AvailablePortFinder.getNextAvailable()).start();
root.debug("This message is written because a deadlock never.");
@@ -212,7 +209,7 @@ public class SocketAppenderTest {
private Thread thread;
public UDPSocketServer() throws IOException {
-this.sock = new DatagramSocket(PORTNUM1);
+this.sock = new
DatagramSocket(AvailablePortFinder.getNextAvailable());
}
public void shutdown() {
[14/14] logging-log4j2 git commit: Merge branch 'master' into LOG4J2-649
Merge branch 'master' into LOG4J2-649 Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/cc267059 Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/cc267059 Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/cc267059 Branch: refs/heads/LOG4J2-649 Commit: cc2670593c4b68d34b61d9167f8ac73837a6f05f Parents: 13bb3d9 b6c67b4 Author: Mikael Ståldal Authored: Thu Dec 3 10:54:25 2015 +0100 Committer: Mikael Ståldal Committed: Thu Dec 3 10:54:25 2015 +0100 -- .../appender/AbstractOutputStreamAppender.java | 14 +++- .../log4j/core/appender/ConsoleAppender.java| 58 ++--- .../log4j/core/appender/SocketAppender.java | 85 ++-- .../core/appender/ConsoleAppenderTest.java | 14 ++-- .../log4j/core/appender/SocketAppenderTest.java | 31 --- .../net/server/AbstractSocketServerTest.java| 10 +-- .../core/net/server/SslXmlSocketServerTest.java | 4 +- 7 files changed, 133 insertions(+), 83 deletions(-) --
