Author: orudyy
Date: Thu Jun 25 11:26:54 2015
New Revision: 1687480
URL: http://svn.apache.org/r1687480
Log:
QPID-6591: Fix setting of log record layout in RollingFileAppenderFactory (work
by Lorenz Quack and Alex Rudyy)
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/RollingFileAppenderFactory.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/RollingFileAppenderFactoryTest.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/RollingFileAppenderFactory.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/RollingFileAppenderFactory.java?rev=1687480&r1=1687479&r2=1687480&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/RollingFileAppenderFactory.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/RollingFileAppenderFactory.java
Thu Jun 25 11:26:54 2015
@@ -69,7 +69,7 @@ public class RollingFileAppenderFactory
sizeTriggeringPolicy.start();
}
final PatternLayoutEncoder encoder = new PatternLayoutEncoder();
- encoder.setPattern("%d %-5p [%t] \\(%c{2}\\) - %m%n");
+ encoder.setPattern(fileLoggerSettings.getLayout());
encoder.setContext(loggerContext);
encoder.start();
appender.setEncoder(encoder);
Modified:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/RollingFileAppenderFactoryTest.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/RollingFileAppenderFactoryTest.java?rev=1687480&r1=1687479&r2=1687480&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/RollingFileAppenderFactoryTest.java
(original)
+++
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/RollingFileAppenderFactoryTest.java
Thu Jun 25 11:26:54 2015
@@ -37,7 +37,7 @@ import org.apache.qpid.test.utils.QpidTe
public class RollingFileAppenderFactoryTest extends QpidTestCase
{
public static final String FILE_NAME = "TEST";
- public static final String LAYOUT = "%d %-5p [%t] \\(%c{2}\\) - %m%n";
+ public static final String LAYOUT = "%d %-5p [%t] \\(%c{2}\\) # %m%n";
public static final String MAX_FILE_SIZE = "100mb";
public static final int MAX_HISTORY = 10;
@@ -74,6 +74,7 @@ public class RollingFileAppenderFactoryT
TriggeringPolicy triggeringPolicy = ((TimeBasedRollingPolicy)
rollingPolicy).getTimeBasedFileNamingAndTriggeringPolicy();
assertTrue("Unexpected triggering policy", triggeringPolicy instanceof
RollingFileAppenderFactory.DailyTriggeringPolicy);
assertEquals("Unexpected triggering policy", MAX_FILE_SIZE,
((RollingFileAppenderFactory.DailyTriggeringPolicy)
triggeringPolicy).getMaxFileSize());
+ assertEquals("Unexpected layout", LAYOUT,
((PatternLayoutEncoder)appender.getEncoder()).getPattern());
}
public void testCreateRollingFileAppenderNonDailyRolling()
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
