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 2017/08/15 23:08:13 UTC

logging-log4j-tools git commit: Add util methods for tests.

Repository: logging-log4j-tools
Updated Branches:
  refs/heads/master 5c1f0a0d5 -> 3826b3e4d


Add util methods for tests.

Project: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/commit/3826b3e4
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/tree/3826b3e4
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/diff/3826b3e4

Branch: refs/heads/master
Commit: 3826b3e4d46b2d427d0f130adfc72e0f604971ab
Parents: 5c1f0a0
Author: Gary Gregory <ga...@gmail.com>
Authored: Tue Aug 15 17:08:12 2017 -0600
Committer: Gary Gregory <ga...@gmail.com>
Committed: Tue Aug 15 17:08:12 2017 -0600

----------------------------------------------------------------------
 .../org/apache/logging/log4j/server/SecureTcpSocketServer.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j-tools/blob/3826b3e4/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
----------------------------------------------------------------------
diff --git a/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java b/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
index 81c9d64..39f2afc 100644
--- a/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
+++ b/log4j-server/src/main/java/org/apache/logging/log4j/server/SecureTcpSocketServer.java
@@ -23,12 +23,16 @@ import org.apache.logging.log4j.core.net.ssl.SslConfiguration;
 
 /**
  * Listens for events over a secure socket connection (SSL/TLS).
- * 
+ *
  * @param <T>
  *        The kind of input stream read
  */
 public class SecureTcpSocketServer<T extends InputStream> extends TcpSocketServer<T> {
 
+    public static SecureTcpSocketServer<InputStream> createJsonServer(final int port, final SslConfiguration sslConfiguration) throws IOException {
+        return new SecureTcpSocketServer<>(port, new JsonInputStreamLogEventBridge(), sslConfiguration);
+    }
+
     public SecureTcpSocketServer(final int port, final LogEventBridge<T> logEventInput,
             final SslConfiguration sslConfig) throws IOException {
         super(port, logEventInput, sslConfig.getSslServerSocketFactory().createServerSocket(port));