You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2017/04/10 13:27:26 UTC
svn commit: r1790828 - in /qpid/java/branches/6.1.x: ./
broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/
broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/
broker/src/main/assembly/d...
Author: orudyy
Date: Mon Apr 10 13:27:25 2017
New Revision: 1790828
URL: http://svn.apache.org/viewvc?rev=1790828&view=rev
Log:
QPID-7468,QPID-7730,QPID-7736,QPID-7737: Upgrade logback to version 1.2.2 and slf4j to version 1.7.25
The changes merged from broker and client trunks using the following commands:
svn merge -c 1789275 ^/qpid/java/trunk
svn merge -c 1789662 ^/qpid/java/trunk
svn merge -c 1790516 ^/qpid/java/trunk
svn merge -c 1790510 ^/qpid/java/trunk
svn merge -c 1790517 ^/qpid/java/trunk
svn merge -c 1790819 ^/qpid/java/trunk
svn merge -c 1790821 ^/qpid/qpid-jms-amqp-0-x/trunk
Added:
qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/LogbackPropertyValueDiscriminator.java
- copied, changed from r1789275, qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/LogbackPropertyValueDiscriminator.java
Modified:
qpid/java/branches/6.1.x/ (props changed)
qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLogger.java
qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java
qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java
qpid/java/branches/6.1.x/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
qpid/java/branches/6.1.x/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
qpid/java/branches/6.1.x/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
qpid/java/branches/6.1.x/pom.xml
qpid/java/branches/6.1.x/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (contents, props changed)
qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
qpid/java/branches/6.1.x/systests/src/main/resources/logback-test.xml
Propchange: qpid/java/branches/6.1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 10 13:27:25 2017
@@ -9,6 +9,6 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
-/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117,1785158,1785269-1785270,1785311,1785675,1785679,1785854,1785936,1785950,1785988,1786188-1786189,1786342,1786657,1786690,1786723,1786914,1786923,1787052,1789526,1789670-1789671,1789938,1790188
-/qpid/qpid-jms-amqp-0-x/trunk:1785989
+/qpid/java/trunk:1766544,1766547,1766553,1766666,1766796-1766797,1766806,1767251,1767267-1767268,1767275,1767310,1767326,1767329,1767332,1767514,1767523,1767738,1767825,1767847-1767849,1767882,1767909,1767914,1768016-1768017,1768065,1768643,1768704,1768854,1768875,1768914,1768963,1768967,1768976,1769007,1769009,1769087,1769138-1769139,1769597,1769879,1770236,1770716,1772050,1772241,1772365,1772574,1773057,1774039,1774446,1774564,1774885,1775087,1775100,1777939,1780947,1782302,1782735,1785117,1785158,1785269-1785270,1785311,1785675,1785679,1785854,1785936,1785950,1785988,1786188-1786189,1786342,1786657,1786690,1786723,1786914,1786923,1787052,1789275,1789526,1789662,1789670-1789671,1789938,1790188,1790510,1790516-1790517,1790819
+/qpid/qpid-jms-amqp-0-x/trunk:1785989,1790821
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java (original)
+++ qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/AppenderUtils.java Mon Apr 10 13:27:25 2017
@@ -21,6 +21,8 @@
package org.apache.qpid.server.logging.logback;
import java.io.File;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
import ch.qos.logback.classic.spi.ILoggingEvent;
@@ -32,6 +34,8 @@ import ch.qos.logback.core.rolling.SizeA
import ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy;
import ch.qos.logback.core.rolling.TimeBasedRollingPolicy;
import ch.qos.logback.core.rolling.TriggeringPolicy;
+import ch.qos.logback.core.util.FileSize;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
public class AppenderUtils
@@ -94,6 +98,50 @@ public class AppenderUtils
appender.setEncoder(encoder);
}
+ private static void setMaxFileSize(TriggeringPolicy policy, FileSize fileSize)
+ {
+ final String setMaxFileSizeMethodName = "setMaxFileSize";
+
+ Method maxFileSizeMethod;
+ Object maxFileSizeArg;
+ try
+ {
+ maxFileSizeMethod =
+ policy.getClass().getMethod(setMaxFileSizeMethodName, FileSize.class);
+ maxFileSizeArg = fileSize;
+ }
+ catch (NoSuchMethodException e)
+ {
+ try
+ {
+ maxFileSizeMethod =
+ policy.getClass().getMethod(setMaxFileSizeMethodName, String.class);
+ maxFileSizeArg = String.valueOf(fileSize.getSize());
+ }
+ catch (NoSuchMethodException e1)
+ {
+ throw new IllegalStateException(String.format("Failed to find method %s on %s",
+ setMaxFileSizeMethodName,
+ policy.getClass()));
+ }
+ }
+
+ try
+ {
+ maxFileSizeMethod.invoke(policy, maxFileSizeArg);
+ }
+ catch (IllegalAccessException e)
+ {
+ throw new RuntimeException(String.format("Failed to reflectively invoke %s", maxFileSizeMethod.getName()),
+ e);
+ }
+ catch (InvocationTargetException e)
+ {
+ throw new RuntimeException(String.format("Failed to reflectively invoke %s", maxFileSizeMethod.getName()),
+ e.getCause());
+ }
+ }
+
static void validateLogFilePermissions(final File file)
{
if ((file.exists() && (!file.isFile() || !file.canWrite())) || !file.getAbsoluteFile().getParentFile().canWrite())
@@ -113,12 +161,14 @@ public class AppenderUtils
static class DailyTriggeringPolicy extends SizeAndTimeBasedFNATP<ILoggingEvent>
{
private final boolean _rollOnRestart;
+ private final String _maxFileSize;
private boolean _isFirst = true;
public DailyTriggeringPolicy(boolean isRollOnRestart, String maxFileSize)
{
_rollOnRestart = isRollOnRestart;
- setMaxFileSize(maxFileSize);
+ _maxFileSize = maxFileSize;
+ AppenderUtils.setMaxFileSize(this, FileSize.valueOf(maxFileSize));
}
@Override
@@ -146,18 +196,23 @@ public class AppenderUtils
}
}
+ public String getMaxFileSizeAsString()
+ {
+ return _maxFileSize;
+ }
}
static class SizeTriggeringPolicy extends SizeBasedTriggeringPolicy<ILoggingEvent>
{
private final boolean _rollOnRestart;
+ private final String _maxFileSize;
private boolean _isFirst = true;
public SizeTriggeringPolicy(boolean isRollOnRestart, String maxFileSize)
{
_rollOnRestart = isRollOnRestart;
- setMaxFileSize(maxFileSize);
-
+ _maxFileSize = maxFileSize;
+ AppenderUtils.setMaxFileSize(this, FileSize.valueOf(maxFileSize));
}
@Override
@@ -174,6 +229,10 @@ public class AppenderUtils
}
}
+ public String getMaxFileSizeAsString()
+ {
+ return _maxFileSize;
+ }
}
static class SimpleRollingPolicy extends FixedWindowRollingPolicy
Modified: qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLogger.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLogger.java?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLogger.java (original)
+++ qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLogger.java Mon Apr 10 13:27:25 2017
@@ -38,6 +38,7 @@ public interface BrokerLogbackSocketLogg
String RECONNECTION_DELAY = "reconnectionDelay";
String INCLUDE_CALLER_DATA = "includeCallerData";
String MAPPED_DIAGNOSTIC_CONTEXT = "mappedDiagnosticContext";
+ String CONTEXT_PROPERTIES = "contextProperties";
@ManagedAttribute(mandatory = true)
int getPort();
@@ -51,6 +52,11 @@ public interface BrokerLogbackSocketLogg
@ManagedAttribute(defaultValue = "true")
boolean getIncludeCallerData();
- @ManagedAttribute( defaultValue = "{}")
+ @ManagedAttribute(defaultValue = "{}",
+ description = "The mapped diagnostic context that will accompany each logging event before being sent to the remote host.")
Map<String, String> getMappedDiagnosticContext();
+
+ @ManagedAttribute(defaultValue = "{}",
+ description = "Context properties that will be added to the global logback logging context.")
+ Map<String, String> getContextProperties();
}
Modified: qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java (original)
+++ qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/BrokerLogbackSocketLoggerImpl.java Mon Apr 10 13:27:25 2017
@@ -22,23 +22,33 @@
package org.apache.qpid.server.logging.logback;
import java.util.HashSet;
+import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Set;
+import java.util.concurrent.CopyOnWriteArrayList;
import ch.qos.logback.classic.net.SocketAppender;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.Context;
import ch.qos.logback.core.util.Duration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.slf4j.MDC;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.ManagedObjectFactoryConstructor;
+import org.apache.qpid.server.util.Action;
public class BrokerLogbackSocketLoggerImpl
extends AbstractBrokerLogger<BrokerLogbackSocketLoggerImpl> implements BrokerLogbackSocketLogger<BrokerLogbackSocketLoggerImpl>
{
+ private static final Logger _logger = LoggerFactory.getLogger(BrokerLogbackSocketLoggerImpl.class);
+
+ private final List<Action<Void>> _stopLoggingActions = new CopyOnWriteArrayList<>();
+
@ManagedAttributeField
private String _remoteHost;
@@ -54,6 +64,9 @@ public class BrokerLogbackSocketLoggerIm
@ManagedAttributeField
private Map<String,String> _mappedDiagnosticContext;
+ @ManagedAttributeField
+ private Map<String, String> _contextProperties;
+
@ManagedObjectFactoryConstructor
protected BrokerLogbackSocketLoggerImpl(final Map<String, Object> attributes, Broker<?> broker)
{
@@ -91,8 +104,38 @@ public class BrokerLogbackSocketLoggerIm
}
@Override
- protected Appender<ILoggingEvent> createAppenderInstance(Context loggerContext)
+ public Map<String, String> getContextProperties()
+ {
+ return _contextProperties;
+ }
+
+ @Override
+ protected Appender<ILoggingEvent> createAppenderInstance(final Context loggerContext)
{
+ if (_contextProperties != null && !_contextProperties.isEmpty())
+ {
+ for (Map.Entry<String, String> property : _contextProperties.entrySet())
+ {
+ final String key = property.getKey();
+ final String value = property.getValue();
+ final String existingValue = loggerContext.getProperty(key);
+ if (existingValue != null && !Objects.equals(existingValue, value))
+ {
+ _logger.warn("Logback context property key '{}' value '{}' overwritten with value '{}", key, existingValue, value);
+ }
+ loggerContext.putProperty(key, value);
+
+ _stopLoggingActions.add(new Action<Void>()
+ {
+ @Override
+ public void performAction(final Void object)
+ {
+ loggerContext.putProperty(key, existingValue);
+ }
+ });
+ }
+ }
+
SocketAppender socketAppender = new SocketAppender()
{
@Override
@@ -125,6 +168,22 @@ public class BrokerLogbackSocketLoggerIm
socketAppender.setIncludeCallerData(_includeCallerData);
socketAppender.setReconnectionDelay(Duration.buildByMilliseconds(_reconnectionDelay));
return socketAppender;
+ }
+ @Override
+ public void stopLogging()
+ {
+ try
+ {
+ for (Action action : _stopLoggingActions)
+ {
+ action.performAction(null);
+ }
+ _stopLoggingActions.clear();
+ }
+ finally
+ {
+ super.stopLogging();
+ }
}
}
Modified: qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java (original)
+++ qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/AppenderUtilsTest.java Mon Apr 10 13:27:25 2017
@@ -28,19 +28,17 @@ import java.nio.file.Files;
import java.nio.file.Path;
import java.util.concurrent.ScheduledExecutorService;
+import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.encoder.PatternLayoutEncoder;
import ch.qos.logback.classic.spi.ILoggingEvent;
-import ch.qos.logback.core.Context;
import ch.qos.logback.core.encoder.Encoder;
import ch.qos.logback.core.rolling.RollingFileAppender;
import ch.qos.logback.core.rolling.RollingPolicy;
import ch.qos.logback.core.rolling.TimeBasedRollingPolicy;
import ch.qos.logback.core.rolling.TriggeringPolicy;
import ch.qos.logback.core.rolling.helper.CompressionMode;
+
import org.apache.qpid.server.configuration.IllegalConfigurationException;
-import org.apache.qpid.server.logging.logback.AppenderUtils;
-import org.apache.qpid.server.logging.logback.FileLoggerSettings;
-import org.apache.qpid.server.logging.logback.RollingPolicyDecorator;
import org.apache.qpid.test.utils.QpidTestCase;
public class AppenderUtilsTest extends QpidTestCase
@@ -80,7 +78,7 @@ public class AppenderUtilsTest extends Q
public void testCreateRollingFileAppenderDailyRolling()
{
final RollingFileAppender<ILoggingEvent> appender = new RollingFileAppender<>();
- AppenderUtils.configureRollingFileAppender(_settings, mock(Context.class), appender);
+ AppenderUtils.configureRollingFileAppender(_settings, new LoggerContext(), appender);
assertEquals("Unexpected appender file name", _testLogFileName, appender.getFile());
@@ -98,7 +96,7 @@ public class AppenderUtilsTest extends Q
assertTrue("Unexpected triggering policy", triggeringPolicy instanceof AppenderUtils.DailyTriggeringPolicy);
assertEquals("Unexpected triggering policy",
String.valueOf(MAX_FILE_SIZE) + "MB",
- ((AppenderUtils.DailyTriggeringPolicy) triggeringPolicy).getMaxFileSize());
+ ((AppenderUtils.DailyTriggeringPolicy) triggeringPolicy).getMaxFileSizeAsString().toString());
assertEquals("Unexpected layout", LAYOUT, ((PatternLayoutEncoder) appender.getEncoder()).getPattern());
}
@@ -108,7 +106,7 @@ public class AppenderUtilsTest extends Q
when(_settings.isCompressOldFiles()).thenReturn(Boolean.FALSE);
RollingFileAppender<ILoggingEvent> appender = new RollingFileAppender<>();
- AppenderUtils.configureRollingFileAppender(_settings, mock(Context.class), appender);
+ AppenderUtils.configureRollingFileAppender(_settings, new LoggerContext(), appender);
assertEquals("Unexpected appender file name", _testLogFileName, appender.getFile());
@@ -123,7 +121,7 @@ public class AppenderUtilsTest extends Q
TriggeringPolicy triggeringPolicy = appender.getTriggeringPolicy();
assertEquals("Unexpected triggering policy",
String.valueOf(MAX_FILE_SIZE) + "MB",
- ((AppenderUtils.SizeTriggeringPolicy) triggeringPolicy).getMaxFileSize());
+ ((AppenderUtils.SizeTriggeringPolicy) triggeringPolicy).getMaxFileSizeAsString().toString());
Encoder encoder = appender.getEncoder();
assertTrue("Unexpected encoder", encoder instanceof PatternLayoutEncoder);
Modified: qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java (original)
+++ qpid/java/branches/6.1.x/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java Mon Apr 10 13:27:25 2017
@@ -35,9 +35,9 @@ import java.util.ArrayList;
import java.util.List;
import ch.qos.logback.classic.Level;
+import ch.qos.logback.classic.LoggerContext;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
-import ch.qos.logback.core.Context;
import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.logging.logback.StartupAppender;
import org.apache.qpid.test.utils.QpidTestCase;
@@ -114,7 +114,7 @@ public class StartupAppenderTest extends
private StartupAppender createAndStartStartupAppender()
{
StartupAppender startupAppender = new StartupAppender();
- startupAppender.setContext(mock(Context.class));
+ startupAppender.setContext(new LoggerContext());
startupAppender.start();
return startupAppender;
}
Modified: qpid/java/branches/6.1.x/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (original)
+++ qpid/java/branches/6.1.x/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Mon Apr 10 13:27:25 2017
@@ -71,11 +71,11 @@ From: 'Mort Bay Consulting' (http://www.
License: Apache Software License - Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0) License: Eclipse Public License - Version 1.0 (http://www.eclipse.org/org/documents/epl-v10.php)
From: 'QOS.ch' (http://www.qos.ch)
- - Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.1.3
+ - Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.2.2
License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
- - Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.1.3
+ - Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.2.2
License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
- - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.12
+ - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.25
License: MIT License (http://www.opensource.org/licenses/mit-license.php)
From: 'The Apache Software Foundation' (http://www.apache.org)
Modified: qpid/java/branches/6.1.x/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (original)
+++ qpid/java/branches/6.1.x/client/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Mon Apr 10 13:27:25 2017
@@ -25,7 +25,7 @@ Apache Qpid JMS Client for AMQP 0-9-1/0-
From: 'QOS.ch' (http://www.qos.ch)
- - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.12
+ - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.25
License: MIT License (http://www.opensource.org/licenses/mit-license.php)
From: 'The Apache Software Foundation' (http://www.apache.org/)
Modified: qpid/java/branches/6.1.x/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE (original)
+++ qpid/java/branches/6.1.x/perftests/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE Mon Apr 10 13:27:25 2017
@@ -37,11 +37,11 @@ From: 'FasterXML' (http://fasterxml.com/
License: The Apache Software License, Version 2.0 (http://www.apache.org/licenses/LICENSE-2.0.txt)
From: 'QOS.ch' (http://www.qos.ch)
- - Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.1.3
+ - Logback Classic Module (http://logback.qos.ch/logback-classic) ch.qos.logback:logback-classic:jar:1.2.2
License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
- - Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.1.3
+ - Logback Core Module (http://logback.qos.ch/logback-core) ch.qos.logback:logback-core:jar:1.2.2
License: Eclipse Public License - v 1.0 (http://www.eclipse.org/legal/epl-v10.html) License: GNU Lesser General Public License (http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html)
- - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.12
+ - SLF4J API Module (http://www.slf4j.org) org.slf4j:slf4j-api:jar:1.7.25
License: MIT License (http://www.opensource.org/licenses/mit-license.php)
From: 'The Apache Software Foundation' (http://www.apache.org/)
Modified: qpid/java/branches/6.1.x/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/pom.xml?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/pom.xml (original)
+++ qpid/java/branches/6.1.x/pom.xml Mon Apr 10 13:27:25 2017
@@ -115,10 +115,10 @@
<at.sign>@</at.sign>
<bdb-version>5.0.104</bdb-version>
<derby-version>10.11.1.1</derby-version>
- <logback-version>1.1.3</logback-version>
+ <logback-version>1.2.2</logback-version>
<guava-version>18.0</guava-version>
<fasterxml-jackson-version>2.5.3</fasterxml-jackson-version>
- <slf4j-version>1.7.12</slf4j-version>
+ <slf4j-version>1.7.25</slf4j-version>
<jetty-version>8.1.17.v20150415</jetty-version>
<!-- dependency version numbers -->
Modified: qpid/java/branches/6.1.x/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ qpid/java/branches/6.1.x/qpid-test-utils/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Mon Apr 10 13:27:25 2017
@@ -26,14 +26,22 @@ import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.NoSuchElementException;
+import java.util.Properties;
+import java.util.Set;
import ch.qos.logback.classic.ClassicConstants;
+import ch.qos.logback.classic.LoggerContext;
import junit.framework.TestCase;
import junit.framework.TestResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.slf4j.MDC;
public class QpidTestCase extends TestCase
{
@@ -136,12 +144,14 @@ public class QpidTestCase extends TestCa
private static final List<String> _exclusionList;
private static final Properties OVERRIDDEN_PROPERTIES = loadOverriddenTestSystemProperties();
+ @Override
public void run(TestResult testResult)
{
+ final LoggerContext loggerContext = ((ch.qos.logback.classic.Logger) _logger).getLoggerContext();
try
{
_currentInstance = this;
- MDC.put(CLASS_QUALIFIED_TEST_NAME, getClassQualifiedTestName());
+ loggerContext.putProperty(CLASS_QUALIFIED_TEST_NAME, getClassQualifiedTestName());
if (_exclusionList.contains(getClass().getPackage().getName() + ".*") ||
_exclusionList.contains(getClass().getName() + "#*") ||
@@ -160,7 +170,7 @@ public class QpidTestCase extends TestCa
{
_logger.info(ClassicConstants.FINALIZE_SESSION_MARKER, "Shutting down sub-appender");
_currentInstance = null;
- MDC.remove(CLASS_QUALIFIED_TEST_NAME);
+ loggerContext.putProperty(CLASS_QUALIFIED_TEST_NAME, null);
revertTestSystemProperties();
}
}
@@ -278,12 +288,14 @@ public class QpidTestCase extends TestCa
}
}
+ @Override
protected void setUp() throws Exception
{
_logger.info("========== start " + getTestName() + " ==========");
super.setUp();
}
+ @Override
protected void tearDown() throws Exception
{
_logger.info("========== tearDown " + getTestName() + " ==========");
Copied: qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/LogbackPropertyValueDiscriminator.java (from r1789275, qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/LogbackPropertyValueDiscriminator.java)
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/LogbackPropertyValueDiscriminator.java?p2=qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/LogbackPropertyValueDiscriminator.java&p1=qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/LogbackPropertyValueDiscriminator.java&r1=1789275&r2=1790828&rev=1790828&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/LogbackPropertyValueDiscriminator.java (original)
+++ qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/LogbackPropertyValueDiscriminator.java Mon Apr 10 13:27:25 2017
@@ -51,12 +51,13 @@ public class LogbackPropertyValueDiscrim
_key = key;
}
- public String getDefaultValue() {
+ public String getDefaultValue()
+ {
return _defaultValue;
}
- public void setDefaultValue(String defaultValue) {
+ public void setDefaultValue(String defaultValue)
+ {
_defaultValue = defaultValue;
}
-
}
Modified: qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Mon Apr 10 13:27:25 2017
@@ -740,7 +740,7 @@ public class QpidBrokerTestCase extends
private File getFileFromSiftingAppender(final ch.qos.logback.classic.Logger logger)
{
- String key = MDC.get(QpidTestCase.CLASS_QUALIFIED_TEST_NAME);
+ String key = logger.getLoggerContext().getProperty(QpidTestCase.CLASS_QUALIFIED_TEST_NAME);
for (Iterator<Appender<ILoggingEvent>> index = logger.iteratorForAppenders(); index.hasNext(); /* do nothing */)
{
Propchange: qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 10 13:27:25 2017
@@ -8,4 +8,5 @@
/qpid/branches/java-broker-vhost-refactor/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:805429-821809
/qpid/branches/qpid-2935/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1061302-1072333
+/qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:1789275
/qpid/trunk/qpid/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java:796646-796653
Modified: qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java (original)
+++ qpid/java/branches/6.1.x/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java Mon Apr 10 13:27:25 2017
@@ -80,10 +80,6 @@ public class SpawnedBrokerHolder extends
@Override
public void start(BrokerOptions brokerOptions) throws Exception
{
- Map<String, String> mdc = new HashMap<>();
- mdc.put(QpidBrokerTestCase.CLASS_QUALIFIED_TEST_NAME, getClassQualifiedTestName());
- mdc.put("origin", getLogPrefix());
-
LOGGER.debug("Spawning broker with options: {} jvmOptions: {} environmentSettings: {} permitted start-up time: {}",
brokerOptions, _jvmOptions, _environmentSettings, BROKER_STARTUP_TIME);
@@ -483,14 +479,17 @@ public class SpawnedBrokerHolder extends
String remotelogback = "remotelogback";
Map<String, String> mdc = new HashMap<>();
- mdc.put(QpidBrokerTestCase.CLASS_QUALIFIED_TEST_NAME, getClassQualifiedTestName());
mdc.put("origin", getLogPrefix());
+ Map<String, String> contextProperties = new HashMap<>();
+ contextProperties.put(QpidBrokerTestCase.CLASS_QUALIFIED_TEST_NAME, getClassQualifiedTestName());
+
Map<String, Object> loggerAttrs = new HashMap<>();
loggerAttrs.put(BrokerLogger.TYPE, BrokerLogbackSocketLogger.TYPE);
loggerAttrs.put(BrokerLogbackSocketLogger.NAME, remotelogback);
loggerAttrs.put(BrokerLogbackSocketLogger.PORT, QpidBrokerTestCase.LOGBACK_REMOTE_PORT);
loggerAttrs.put(BrokerLogbackSocketLogger.MAPPED_DIAGNOSTIC_CONTEXT, mdc);
+ loggerAttrs.put(BrokerLogbackSocketLogger.CONTEXT_PROPERTIES, contextProperties);
configuration.addObjectConfiguration(BrokerLogger.class, loggerAttrs);
Modified: qpid/java/branches/6.1.x/systests/src/main/resources/logback-test.xml
URL: http://svn.apache.org/viewvc/qpid/java/branches/6.1.x/systests/src/main/resources/logback-test.xml?rev=1790828&r1=1790827&r2=1790828&view=diff
==============================================================================
--- qpid/java/branches/6.1.x/systests/src/main/resources/logback-test.xml (original)
+++ qpid/java/branches/6.1.x/systests/src/main/resources/logback-test.xml Mon Apr 10 13:27:25 2017
@@ -29,7 +29,7 @@
<define name="receiverPort" class="org.apache.qpid.test.utils.LogbackSocketPortNumberDefiner"/>
<appender name="RootSiftAppender" class="ch.qos.logback.classic.sift.SiftingAppender">
- <discriminator>
+ <discriminator class="org.apache.qpid.test.utils.LogbackPropertyValueDiscriminator">
<Key>classQualifiedTestName</Key>
<DefaultValue>testrun</DefaultValue>
</discriminator>
@@ -39,7 +39,7 @@
<Append>False</Append>
<encoder>
<!-- origin identifies the broker, valuable when the test involves multiple brokers -->
- <pattern>%date %-7X{origin} %-5level [%thread] %logger{10} %msg%n</pattern>
+ <pattern>%date %-8X{origin} %-5level [%thread] %logger{10} %msg%n</pattern>
</encoder>
</appender>
</sift>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org