You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2017/02/05 22:18:49 UTC
svn commit: r1781816 - in
/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms: ./ client/
control/gui/ sampler/
Author: pmouawad
Date: Sun Feb 5 22:18:49 2017
New Revision: 1781816
URL: http://svn.apache.org/viewvc?rev=1781816&view=rev
Log:
Bug 60564 - Migrating LogKit to SLF4J - Replace logkit loggers with slf4j ones with keeping the current logkit binding solution
Use slf4j parameterized messages
Bugzilla Id: 60564
Modified:
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java?rev=1781816&r1=1781815&r2=1781816&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java Sun Feb 5 22:18:49 2017
@@ -34,8 +34,8 @@ import javax.naming.NamingException;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.protocol.jms.sampler.JMSProperties;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Utility methods for JMS protocol.
@@ -50,7 +50,7 @@ public final class Utils {
// http://docs.oracle.com/javaee/6/tutorial/doc/bncfu.html
public static final String DEFAULT_NO_EXPIRY = "0"; // $NON-NLS-1$
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Utils.class);
public static void close(MessageConsumer closeable, Logger log){
if (closeable != null){
@@ -82,6 +82,10 @@ public final class Utils {
}
}
+ /**
+ * @param closeable {@link MessageProducer}
+ * @param log {@link Logger}
+ */
public static void close(MessageProducer closeable, Logger log) {
if (closeable != null){
try {
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java?rev=1781816&r1=1781815&r2=1781816&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java Sun Feb 5 22:18:49 2017
@@ -26,8 +26,8 @@ import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.apache.commons.lang3.StringUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* InitialContextFactory is responsible for getting an instance of the initial context.
@@ -36,7 +36,7 @@ public class InitialContextFactory {
private static final ConcurrentHashMap<String, Context> MAP = new ConcurrentHashMap<>();
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(InitialContextFactory.class);
/**
* Look up the context from the local cache, creating it if necessary.
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java?rev=1781816&r1=1781815&r2=1781816&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java Sun Feb 5 22:18:49 2017
@@ -37,12 +37,12 @@ import javax.naming.Context;
import javax.naming.NamingException;
import org.apache.jmeter.protocol.jms.Utils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class Publisher implements Closeable {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Publisher.class);
private final Connection connection;
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java?rev=1781816&r1=1781815&r2=1781816&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java Sun Feb 5 22:18:49 2017
@@ -34,8 +34,8 @@ import javax.naming.Context;
import javax.naming.NamingException;
import org.apache.jmeter.protocol.jms.Utils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Generic MessageConsumer class, which has two possible strategies.
@@ -48,7 +48,7 @@ import org.apache.log.Logger;
*/
public class ReceiveSubscriber implements Closeable, MessageListener {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(ReceiveSubscriber.class);
private final Connection connection;
@@ -353,7 +353,7 @@ public class ReceiveSubscriber implement
connectionStarted = false;
}
} catch (JMSException e) {
- log.warn("Stopping connection throws exception, message:"+e.getMessage(), e);
+ log.warn("Stopping connection throws exception, message: {}", e.getMessage(), e);
}
Utils.close(subscriber, log);
Utils.close(session, log);
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java?rev=1781816&r1=1781815&r2=1781816&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java Sun Feb 5 22:18:49 2017
@@ -35,13 +35,14 @@ import javax.swing.table.AbstractTableMo
import javax.swing.table.TableColumn;
import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
+import org.apache.jmeter.protocol.jms.Utils;
import org.apache.jmeter.protocol.jms.sampler.JMSProperties;
import org.apache.jmeter.protocol.jms.sampler.JMSProperty;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.GuiUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Handles input for Jms Properties
@@ -51,7 +52,7 @@ public class JMSPropertiesPanel extends
private static final long serialVersionUID = -2893899384410289131L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JMSPropertiesPanel.class);
private static final String ADD_COMMAND = "Add"; //$NON-NLS-1$
@@ -311,9 +312,7 @@ public class JMSPropertiesPanel extends
@Override
public void setValueAt(Object value, int row, int column) {
JMSProperty property = jmsProperties.getJmsProperty(row);
- if(log.isDebugEnabled()) {
- log.debug("Setting jms property value: " + value);
- }
+ log.debug("Setting jms property value: {}", value);
switch (column){
case COL_NAME:
property.setName((String)value);
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java?rev=1781816&r1=1781815&r2=1781816&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java Sun Feb 5 22:18:49 2017
@@ -27,12 +27,13 @@ import javax.jms.JMSException;
import javax.jms.Message;
import org.apache.commons.lang3.StringUtils;
+import org.apache.jmeter.protocol.jms.Utils;
import org.apache.jmeter.samplers.AbstractSampler;
import org.apache.jmeter.samplers.Entry;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
*
@@ -41,9 +42,9 @@ import org.apache.log.Logger;
*/
public abstract class BaseJMSSampler extends AbstractSampler {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
- private static final Logger LOGGER = LoggingManager.getLoggerForClass();
+ private static final Logger LOGGER = LoggerFactory.getLogger(BaseJMSSampler.class);
//++ These are JMX file attribute names and must not be changed
private static final String JNDI_INITIAL_CONTEXT_FAC = "jms.initial_context_factory"; // $NON-NLS-1$
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java?rev=1781816&r1=1781815&r2=1781816&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/FixedQueueExecutor.java Sun Feb 5 22:18:49 2017
@@ -25,8 +25,8 @@ import javax.jms.JMSException;
import javax.jms.Message;
import javax.jms.MessageProducer;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Request/reply executor with a fixed reply queue. <br>
@@ -36,7 +36,7 @@ import org.apache.log.Logger;
*/
public class FixedQueueExecutor implements QueueExecutor {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(FixedQueueExecutor.class);
/** Sender. */
private final MessageProducer producer;
@@ -89,9 +89,9 @@ public class FixedQueueExecutor implemen
}
try {
- if (log.isDebugEnabled()) {
- log.debug(Thread.currentThread().getName()+" will wait for reply " + id + " started on " + System.currentTimeMillis());
- }
+ log.debug("{} will wait for reply {} started on {}",
+ Thread.currentThread().getName(), id, System.currentTimeMillis());
+
// This used to be request.wait(timeout_ms), where 0 means forever
// However 0 means return immediately for the latch
if (timeout == 0){
@@ -101,10 +101,9 @@ public class FixedQueueExecutor implemen
log.debug("Timeout reached before getting a reply message");
}
}
- if (log.isDebugEnabled()) {
- log.debug(Thread.currentThread().getName()+" done waiting for " + id + " on "+request+" ended on " + System.currentTimeMillis());
- }
-
+ log.debug("{} done waiting for {} on {} ended on {}",
+ Thread.currentThread().getName(),
+ id, request, System.currentTimeMillis());
} catch (InterruptedException e) {
log.warn("Interrupt exception caught", e);
Thread.currentThread().interrupt();
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=1781816&r1=1781815&r2=1781816&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java Sun Feb 5 22:18:49 2017
@@ -45,8 +45,8 @@ import org.apache.jmeter.testelement.Thr
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.TestElementProperty;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class implements the JMS Point-to-Point sampler
@@ -54,7 +54,7 @@ import org.apache.log.Logger;
*/
public class JMSSampler extends AbstractSampler implements ThreadListener {
- private static final Logger LOGGER = LoggingManager.getLoggerForClass();
+ private static final Logger LOGGER = LoggerFactory.getLogger(JMSSampler.class);
private static final long serialVersionUID = 233L;
@@ -330,7 +330,7 @@ public class JMSSampler extends Abstract
if (!(obj instanceof QueueConnectionFactory)) {
String msg = "QueueConnectionFactory expected, but got "
+ (obj != null ? obj.getClass().getName() : "null");
- LOGGER.fatalError(msg);
+ LOGGER.error(msg);
throw new IllegalStateException(msg);
}
QueueConnectionFactory factory = (QueueConnectionFactory) obj;
@@ -357,9 +357,7 @@ public class JMSSampler extends Abstract
session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Session created");
- }
+ LOGGER.debug("Session created");
if (isOneway()) {
producer = session.createSender(sendQueue);
@@ -377,15 +375,11 @@ public class JMSSampler extends Abstract
executor = new FixedQueueExecutor(producer, getTimeoutAsInt(), isUseReqMsgIdAsCorrelId());
}
}
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Starting connection");
- }
+ LOGGER.debug("Starting connection");
connection.start();
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Connection started");
- }
+ LOGGER.debug("Connection started");
} catch (Exception | NoClassDefFoundError e) {
thrown = e;
LOGGER.error(e.getLocalizedMessage(), e);
@@ -396,15 +390,11 @@ public class JMSSampler extends Abstract
Hashtable<String, String> table = new Hashtable<>();
if (getInitialContextFactory() != null && getInitialContextFactory().trim().length() > 0) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Using InitialContext [" + getInitialContextFactory() + "]");
- }
+ LOGGER.debug("Using InitialContext [{}]", getInitialContextFactory());
table.put(Context.INITIAL_CONTEXT_FACTORY, getInitialContextFactory());
}
if (getContextProvider() != null && getContextProvider().trim().length() > 0) {
- if (LOGGER.isDebugEnabled()) {
- LOGGER.debug("Using Provider [" + getContextProvider() + "]");
- }
+ LOGGER.debug("Using Provider [{}]", getContextProvider());
table.put(Context.PROVIDER_URL, getContextProvider());
}
Map<String, String> map = getArguments(JMSSampler.JNDI_PROPERTIES).getArgumentsAsMap();
@@ -412,7 +402,7 @@ public class JMSSampler extends Abstract
if (map.isEmpty()) {
LOGGER.debug("Empty JNDI properties");
} else {
- LOGGER.debug("Number of JNDI properties: " + map.size());
+ LOGGER.debug("Number of JNDI properties: {}", map.size());
}
}
for (Map.Entry<String, String> me : map.entrySet()) {
@@ -432,7 +422,7 @@ public class JMSSampler extends Abstract
if(env != null) {
LOGGER.debug("Initial Context Properties");
for (Map.Entry<?, ?> entry : env.entrySet()) {
- LOGGER.debug(entry.getKey() + "=" + entry.getValue());
+ LOGGER.debug("{}={}", entry.getKey(), entry.getValue());
}
} else {
LOGGER.warn("context.getEnvironment() returned null (should not happen according to javadoc but non compliant implementation can return this)");
@@ -488,7 +478,7 @@ public class JMSSampler extends Abstract
*/
@Override
public void threadFinished() {
- LOGGER.debug("Thread ended " + new Date());
+ LOGGER.debug("Thread ended {}", new Date());
if (context != null) {
try {
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java?rev=1781816&r1=1781815&r2=1781816&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java Sun Feb 5 22:18:49 2017
@@ -24,8 +24,9 @@ import java.util.concurrent.CountDownLat
import javax.jms.Message;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* Administration of messages.
@@ -77,7 +78,7 @@ public class MessageAdmin {
private final Map<String, PlaceHolder> table = new ConcurrentHashMap<>();
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(MessageAdmin.class);
private MessageAdmin() {
}
@@ -105,9 +106,7 @@ public class MessageAdmin {
* was received
*/
public void putRequest(String id, Message request, CountDownLatch latch) {
- if (log.isDebugEnabled()) {
- log.debug("REQ_ID [" + id + "]");
- }
+ log.debug("REQ_ID [{}]", id);
table.put(id, new PlaceHolder(request, latch));
}
@@ -123,22 +122,16 @@ public class MessageAdmin {
*/
public void putReply(String id, Message reply) {
PlaceHolder holder = table.get(id);
- if (log.isDebugEnabled()) {
- log.debug("RPL_ID [" + id + "] for holder " + holder);
- }
+ log.debug("RPL_ID [{}] for holder {}", id, holder);
if (holder != null) {
holder.setReply(reply);
CountDownLatch latch = holder.getLatch();
- if (log.isDebugEnabled()) {
- log.debug(Thread.currentThread().getName()+" releasing latch : " + latch);
- }
+ log.debug("{} releasing latch : {}", Thread.currentThread().getName(), latch);
latch.countDown();
- if (log.isDebugEnabled()) {
- log.debug(Thread.currentThread().getName()+" released latch : " + latch);
- }
+ log.debug("{} released latch : {}", Thread.currentThread().getName(), latch);
} else {
if (log.isDebugEnabled()) {
- log.debug("Failed to match reply: " + reply);
+ log.debug("Failed to match reply: {}", reply);
}
}
}
@@ -152,11 +145,9 @@ public class MessageAdmin {
*/
public Message get(String id) {
PlaceHolder holder = table.remove(id);
- if (log.isDebugEnabled()) {
- log.debug("GET_ID [" + id + "] for " + holder);
- }
+ log.debug("GET_ID [{}] for {}", id, holder);
if (holder == null || !holder.hasReply()) {
- log.debug("Message with " + id + " not found.");
+ log.debug("Message with {} not found.", id);
}
return holder==null ? null : (Message) holder.getReply();
}
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java?rev=1781816&r1=1781815&r2=1781816&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java Sun Feb 5 22:18:49 2017
@@ -49,9 +49,9 @@ import org.apache.jmeter.testelement.Tes
import org.apache.jmeter.testelement.property.TestElementProperty;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.io.TextFile;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JOrphanUtils;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.thoughtworks.xstream.XStream;
@@ -62,7 +62,7 @@ public class PublisherSampler extends Ba
private static final long serialVersionUID = 233L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(PublisherSampler.class);
//++ These are JMX file names and must not be changed
private static final String INPUT_FILE = "jms.input_file"; //$NON-NLS-1$
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java?rev=1781816&r1=1781815&r2=1781816&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java Sun Feb 5 22:18:49 2017
@@ -28,15 +28,15 @@ import javax.jms.Session;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.protocol.jms.Utils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Receiver of pseudo-synchronous reply messages.
*
*/
public final class Receiver implements Runnable {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(Receiver.class);
private volatile boolean active;
@@ -61,16 +61,14 @@ public final class Receiver implements R
*/
private Receiver(ConnectionFactory factory, Destination receiveQueue, String principal, String credentials, boolean useResMsgIdAsCorrelId, String jmsSelector) throws JMSException {
if (null != principal && null != credentials) {
- log.info("creating receiver WITH authorisation credentials. UseResMsgId="+useResMsgIdAsCorrelId);
+ log.info("creating receiver WITH authorisation credentials. UseResMsgId={}", useResMsgIdAsCorrelId);
conn = factory.createConnection(principal, credentials);
}else{
- log.info("creating receiver without authorisation credentials. UseResMsgId="+useResMsgIdAsCorrelId);
+ log.info("creating receiver without authorisation credentials. UseResMsgId={}", useResMsgIdAsCorrelId);
conn = factory.createConnection();
}
session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE);
- if(log.isDebugEnabled()) {
- log.debug("Receiver - ctor. Creating consumer with JMS Selector:"+jmsSelector);
- }
+ log.debug("Receiver - ctor. Creating consumer with JMS Selector:{}", jmsSelector);
if(StringUtils.isEmpty(jmsSelector)) {
consumer = session.createConsumer(receiveQueue);
} else {
Modified: jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java?rev=1781816&r1=1781815&r2=1781816&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java (original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java Sun Feb 5 22:18:49 2017
@@ -39,8 +39,8 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.testelement.TestStateListener;
import org.apache.jmeter.testelement.ThreadListener;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class implements the JMS Subscriber sampler.
@@ -59,7 +59,7 @@ public class SubscriberSampler extends B
private static final long serialVersionUID = 240L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(SubscriberSampler.class);
// Default wait (ms) for a message if timeouts are not enabled
// This is the maximum time the sampler can be blocked.
@@ -187,7 +187,7 @@ public class SubscriberSampler extends B
}
} catch (JMSException e) {
String errorCode = Optional.ofNullable(e.getErrorCode()).orElse("");
- log.warn(String.format("Error [%s] %s", errorCode, e.toString()), e);
+ log.warn("Error [{}] {}", errorCode, e.toString(), e);
handleErrorAndAddTemporize(getIsReconnectErrorCode().test(errorCode));
}
@@ -245,7 +245,7 @@ public class SubscriberSampler extends B
Thread.sleep(pause);
}
} catch (InterruptedException ie) {
- log.warn(String.format("Interrupted %s", ie.toString()), ie);
+ log.warn("Interrupted {}", ie.toString(), ie);
Thread.currentThread().interrupt();
interrupted = true;
}