Author: rgodfrey
Date: Mon Jul 6 14:40:23 2015
New Revision: 1689413
URL: http://svn.apache.org/r1689413
Log:
QPID-6622 : [Java Broker] Add error/warn statistics to loggers
Added:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java
- copied, changed from r1689412,
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/AppenderUtilsTest.java
- copied, changed from r1689412,
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/RollingFileAppenderFactoryTest.java
Removed:
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/BrokerFileLoggerImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java
Copied:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java
(from r1689412,
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/AppenderUtils.java?p2=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/AppenderUtils.java&p1=qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/RollingFileAppenderFactory.java&r1=1689412&r2=1689413&rev=1689413&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/AppenderUtils.java
Mon Jul 6 14:40:23 2015
@@ -34,11 +34,11 @@ import ch.qos.logback.core.rolling.TimeB
import ch.qos.logback.core.rolling.TriggeringPolicy;
import org.apache.qpid.server.logging.logback.RollingPolicyDecorator;
-public class RollingFileAppenderFactory
+public class AppenderUtils
{
- public static RollingFileAppender<ILoggingEvent>
configureRollingFileAppender(FileLoggerSettings fileLoggerSettings,
-
Context loggerContext,
-
final RollingFileAppender<ILoggingEvent> appender)
+ public static void configureRollingFileAppender(FileLoggerSettings
fileLoggerSettings,
+ Context loggerContext,
+
RollingFileAppender<ILoggingEvent> appender)
{
appender.setFile(fileLoggerSettings.getFileName());
appender.setAppend(true);
@@ -82,7 +82,6 @@ public class RollingFileAppenderFactory
encoder.setContext(loggerContext);
encoder.start();
appender.setEncoder(encoder);
- return appender;
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java?rev=1689413&r1=1689412&r2=1689413&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/BrokerFileLoggerImpl.java
Mon Jul 6 14:40:23 2015
@@ -196,8 +196,8 @@ public class BrokerFileLoggerImpl extend
}
}
};
- return RollingFileAppenderFactory.configureRollingFileAppender(this,
loggerContext,
-
appender);
+ AppenderUtils.configureRollingFileAppender(this, loggerContext,
appender);
+ return appender;
}
}
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java?rev=1689413&r1=1689412&r2=1689413&view=diff
==============================================================================
---
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java
(original)
+++
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/VirtualHostFileLoggerImpl.java
Mon Jul 6 14:40:23 2015
@@ -199,8 +199,8 @@ public class VirtualHostFileLoggerImpl e
}
}
};
- RollingFileAppenderFactory.configureRollingFileAppender(this,
loggerContext,
-
appender);
+ AppenderUtils.configureRollingFileAppender(this, loggerContext,
+ appender);
return appender;
}
Copied:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/AppenderUtilsTest.java
(from r1689412,
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/AppenderUtilsTest.java?p2=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/AppenderUtilsTest.java&p1=qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/RollingFileAppenderFactoryTest.java&r1=1689412&r2=1689413&rev=1689413&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/AppenderUtilsTest.java
Mon Jul 6 14:40:23 2015
@@ -37,7 +37,7 @@ import ch.qos.logback.core.rolling.helpe
import org.apache.qpid.server.logging.logback.RollingPolicyDecorator;
import org.apache.qpid.test.utils.QpidTestCase;
-public class RollingFileAppenderFactoryTest extends QpidTestCase
+public class AppenderUtilsTest extends QpidTestCase
{
public static final String FILE_NAME = "TEST";
public static final String LAYOUT = "%d %-5p [%t] \\(%c{2}\\) # %m%n";
@@ -63,9 +63,8 @@ public class RollingFileAppenderFactoryT
public void testCreateRollingFileAppenderDailyRolling()
{
- RollingFileAppender<ILoggingEvent> appender =
RollingFileAppenderFactory.configureRollingFileAppender(_settings,
-
mock(Context.class),
-
new RollingFileAppender<ILoggingEvent>());
+ final RollingFileAppender<ILoggingEvent> appender = new
RollingFileAppender<>();
+ AppenderUtils.configureRollingFileAppender(_settings,
mock(Context.class), appender);
assertEquals("Unexpected appender file name", FILE_NAME,
appender.getFile());
@@ -78,8 +77,8 @@ public class RollingFileAppenderFactoryT
assertEquals("Unexpected compression mode", CompressionMode.GZ,
rollingPolicy.getCompressionMode());
TriggeringPolicy triggeringPolicy = ((TimeBasedRollingPolicy)
rollingPolicy).getTimeBasedFileNamingAndTriggeringPolicy();
- assertTrue("Unexpected triggering policy", triggeringPolicy instanceof
RollingFileAppenderFactory.DailyTriggeringPolicy);
- assertEquals("Unexpected triggering policy", MAX_FILE_SIZE,
((RollingFileAppenderFactory.DailyTriggeringPolicy)
triggeringPolicy).getMaxFileSize());
+ assertTrue("Unexpected triggering policy", triggeringPolicy instanceof
AppenderUtils.DailyTriggeringPolicy);
+ assertEquals("Unexpected triggering policy", MAX_FILE_SIZE,
((AppenderUtils.DailyTriggeringPolicy) triggeringPolicy).getMaxFileSize());
assertEquals("Unexpected layout", LAYOUT,
((PatternLayoutEncoder)appender.getEncoder()).getPattern());
}
@@ -88,22 +87,21 @@ public class RollingFileAppenderFactoryT
when(_settings.isRollDaily()).thenReturn(Boolean.FALSE);
when(_settings.isCompressOldFiles()).thenReturn(Boolean.FALSE);
- RollingFileAppender<ILoggingEvent> appender =
RollingFileAppenderFactory.configureRollingFileAppender(_settings,
-
mock(Context.class),
-
new RollingFileAppender<ILoggingEvent>());
+ RollingFileAppender<ILoggingEvent> appender = new
RollingFileAppender<>();
+ AppenderUtils.configureRollingFileAppender(_settings,
mock(Context.class), appender);
assertEquals("Unexpected appender file name", FILE_NAME,
appender.getFile());
RollingPolicy rollingPolicy = appender.getRollingPolicy();
assertTrue("Unexpected rolling policy", rollingPolicy instanceof
RollingPolicyDecorator);
rollingPolicy = ((RollingPolicyDecorator)rollingPolicy).getDecorated();
- assertTrue("Unexpected decorated rolling policy", rollingPolicy
instanceof RollingFileAppenderFactory.SimpleRollingPolicy);
- assertEquals("Unexpected max history", MAX_HISTORY,
((RollingFileAppenderFactory.SimpleRollingPolicy) rollingPolicy).getMaxIndex());
- assertEquals("Unexpected file name pattern", FILE_NAME + ".%i",
((RollingFileAppenderFactory.SimpleRollingPolicy)
rollingPolicy).getFileNamePattern());
+ assertTrue("Unexpected decorated rolling policy", rollingPolicy
instanceof AppenderUtils.SimpleRollingPolicy);
+ assertEquals("Unexpected max history", MAX_HISTORY,
((AppenderUtils.SimpleRollingPolicy) rollingPolicy).getMaxIndex());
+ assertEquals("Unexpected file name pattern", FILE_NAME + ".%i",
((AppenderUtils.SimpleRollingPolicy) rollingPolicy).getFileNamePattern());
assertEquals("Unexpected compression mode", CompressionMode.NONE,
rollingPolicy.getCompressionMode());
TriggeringPolicy triggeringPolicy = appender.getTriggeringPolicy();
- assertEquals("Unexpected triggering policy", MAX_FILE_SIZE,
((RollingFileAppenderFactory.SizeTriggeringPolicy)
triggeringPolicy).getMaxFileSize());
+ assertEquals("Unexpected triggering policy", MAX_FILE_SIZE,
((AppenderUtils.SizeTriggeringPolicy) triggeringPolicy).getMaxFileSize());
Encoder encoder = appender.getEncoder();
assertTrue("Unexpected encoder", encoder instanceof
PatternLayoutEncoder);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
