You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@logging.apache.org by mi...@apache.org on 2017/06/28 13:22:37 UTC

logging-log4j2 git commit: LOG4J2-1958 Fix tests

Repository: logging-log4j2
Updated Branches:
  refs/heads/LOG4J2-1958 c1b90f961 -> 041f42dad


LOG4J2-1958 Fix tests


Project: http://git-wip-us.apache.org/repos/asf/logging-log4j2/repo
Commit: http://git-wip-us.apache.org/repos/asf/logging-log4j2/commit/041f42da
Tree: http://git-wip-us.apache.org/repos/asf/logging-log4j2/tree/041f42da
Diff: http://git-wip-us.apache.org/repos/asf/logging-log4j2/diff/041f42da

Branch: refs/heads/LOG4J2-1958
Commit: 041f42dad1217a0b8c5cd7fb1b52136733cf1656
Parents: c1b90f9
Author: Mikael Ståldal <mi...@staldal.nu>
Authored: Wed Jun 28 15:22:29 2017 +0200
Committer: Mikael Ståldal <mi...@staldal.nu>
Committed: Wed Jun 28 15:22:29 2017 +0200

----------------------------------------------------------------------
 log4j-core/src/test/resources/log4j-socket-options.xml     | 1 +
 log4j-core/src/test/resources/log4j-ssl-socket-options.xml | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/041f42da/log4j-core/src/test/resources/log4j-socket-options.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-socket-options.xml b/log4j-core/src/test/resources/log4j-socket-options.xml
index 3af324f..c665e05 100644
--- a/log4j-core/src/test/resources/log4j-socket-options.xml
+++ b/log4j-core/src/test/resources/log4j-socket-options.xml
@@ -18,6 +18,7 @@
 <Configuration status="OFF" name="MyApp">
   <Appenders>
     <Socket name="socket" host="localhost" port="${sys:SocketAppenderSocketOptionsTest.port}" protocol="TCP" ignoreExceptions="false">
+      <JsonLayout properties="true"/>
       <SocketOptions keepAlive="false" oobInline="false" receiveBufferSize="10000" reuseAddress="false"
         rfc1349TrafficClass="IPTOS_LOWCOST" sendBufferSize="8000" soLinger="12345" soTimeout="54321" tcpNoDelay="false">
         <SocketPerformancePreferences bandwidth="100" connectionTime="100" latency="100" />

http://git-wip-us.apache.org/repos/asf/logging-log4j2/blob/041f42da/log4j-core/src/test/resources/log4j-ssl-socket-options.xml
----------------------------------------------------------------------
diff --git a/log4j-core/src/test/resources/log4j-ssl-socket-options.xml b/log4j-core/src/test/resources/log4j-ssl-socket-options.xml
index 5b7d08d..00fe5d3 100644
--- a/log4j-core/src/test/resources/log4j-ssl-socket-options.xml
+++ b/log4j-core/src/test/resources/log4j-ssl-socket-options.xml
@@ -19,6 +19,7 @@
   <Appenders>
     <Socket name="socket" host="localhost" port="${sys:SecureSocketAppenderSocketOptionsTest.port}" protocol="SSL"
       ignoreExceptions="false">
+      <JsonLayout properties="true"/>
       <SocketOptions keepAlive="false" receiveBufferSize="10000" reuseAddress="false" rfc1349TrafficClass="IPTOS_LOWCOST"
         sendBufferSize="8000" soLinger="12345" soTimeout="54321" tcpNoDelay="false">
         <SocketPerformancePreferences bandwidth="100" connectionTime="100" latency="100" />