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/08 12:19:15 UTC
svn commit: r1782150 - in /jmeter/trunk/src/components/org/apache/jmeter:
assertions/ modifiers/ modifiers/gui/ reporters/ sampler/ timers/
Author: pmouawad
Date: Wed Feb 8 12:19:15 2017
New Revision: 1782150
URL: http://svn.apache.org/viewvc?rev=1782150&view=rev
Log:
Bug 60564 - Migrating LogKit to SLF4J - Replace logkit loggers with slf4j ones with keeping the current logkit binding solution
Contributed by Woonsan Ko
This closes #265
Bugzilla Id: 60564
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessor.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/SampleTimeout.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java
jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/BSFAssertion.java Wed Feb 8 12:19:15 2017
@@ -43,7 +43,7 @@ public class BSFAssertion extends BSFTes
processFileOrScript(mgr);
result.setError(false);
} catch (BSFException e) {
- log.warn("Problem in BSF script "+e);
+ log.warn("Problem in BSF script {}",e.toString());
result.setFailure(true);
result.setError(true);
result.setFailureMessage(e.toString());
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessor.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/BSFPreProcessor.java Wed Feb 8 12:19:15 2017
@@ -23,14 +23,14 @@ import org.apache.bsf.BSFManager;
import org.apache.jmeter.processor.PreProcessor;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.util.BSFTestElement;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BSFPreProcessor extends BSFTestElement implements Cloneable, PreProcessor, TestBean
{
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(BSFPreProcessor.class);
- private static final long serialVersionUID = 232L;
+ private static final long serialVersionUID = 233L;
@Override
public void process(){
@@ -42,7 +42,7 @@ public class BSFPreProcessor extends BSF
}
processFileOrScript(mgr);
} catch (BSFException e) {
- log.warn("Problem in BSF script "+e);
+ log.warn("Problem in BSF script. {}", e.toString());
} finally {
if (mgr != null) {
mgr.terminate();
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java Wed Feb 8 12:19:15 2017
@@ -25,16 +25,16 @@ import org.apache.jmeter.threads.JMeterC
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.util.BeanShellInterpreter;
import org.apache.jmeter.util.BeanShellTestElement;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JMeterException;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BeanShellPreProcessor extends BeanShellTestElement
implements Cloneable, PreProcessor, TestBean
{
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(BeanShellPreProcessor.class);
- private static final long serialVersionUID = 4;
+ private static final long serialVersionUID = 5;
// can be specified in jmeter.properties
private static final String INIT_FILE = "beanshell.preprocessor.init"; //$NON-NLS-1$
@@ -58,7 +58,7 @@ public class BeanShellPreProcessor exten
bshInterpreter.set("sampler", sam);//$NON-NLS-1$
processFileOrScript(bshInterpreter);
} catch (JMeterException e) {
- log.warn("Problem in BeanShell script "+e);
+ log.warn("Problem in BeanShell script. {}", e.toString());
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java Wed Feb 8 12:19:15 2017
@@ -29,8 +29,8 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.testelement.property.LongProperty;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.JMeterVariables;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Provides a counter per-thread(user) or per-thread group.
@@ -38,7 +38,7 @@ import org.apache.log.Logger;
public class CounterConfig extends AbstractTestElement
implements Serializable, LoopIterationListener, NoThreadClone {
- private static final long serialVersionUID = 233L;
+ private static final long serialVersionUID = 234L;
private static final String START = "CounterConfig.start"; // $NON-NLS-1$
@@ -66,7 +66,7 @@ public class CounterConfig extends Abstr
// Used for per-thread/user storage of increment in Thread Group Main loop
private transient ThreadLocal<Long> perTheadLastIterationNumber;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(CounterConfig.class);
private void init() { // WARNING: called from ctor so must not be overridden (i.e. must be private or final)
perTheadNumber = new ThreadLocal<Long>() {
@@ -139,7 +139,7 @@ public class CounterConfig extends Abstr
DecimalFormat myFormatter = new DecimalFormat(format);
return myFormatter.format(value);
} catch (IllegalArgumentException ignored) {
- log.warn("Error formating "+value + " at format:"+format+", using default");
+ log.warn("Error formating {} at format {}, using default", value, format);
}
}
return Long.toString(value);
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/JSR223PreProcessor.java Wed Feb 8 12:19:15 2017
@@ -26,14 +26,14 @@ import javax.script.ScriptException;
import org.apache.jmeter.processor.PreProcessor;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.util.JSR223TestElement;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JSR223PreProcessor extends JSR223TestElement implements Cloneable, PreProcessor, TestBean
{
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JSR223PreProcessor.class);
- private static final long serialVersionUID = 232L;
+ private static final long serialVersionUID = 233L;
@Override
public void process() {
@@ -41,7 +41,7 @@ public class JSR223PreProcessor extends
ScriptEngine scriptEngine = getScriptEngine();
processFileOrScript(scriptEngine, null);
} catch (ScriptException | IOException e) {
- log.error("Problem in JSR223 script "+getName(), e);
+ log.error("Problem in JSR223 script, {}", getName(), e);
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/SampleTimeout.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/SampleTimeout.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/SampleTimeout.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/SampleTimeout.java Wed Feb 8 12:19:15 2017
@@ -32,8 +32,8 @@ import org.apache.jmeter.testelement.Abs
import org.apache.jmeter.testelement.TestElement;
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;
/**
*
@@ -42,9 +42,9 @@ import org.apache.log.Logger;
*/
public class SampleTimeout extends AbstractTestElement implements Serializable, ThreadListener, SampleMonitor {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 2L;
- private static final Logger LOG = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(SampleTimeout.class);
private static final String TIMEOUT = "InterruptTimer.timeout"; //$NON-NLS-1$
@@ -75,10 +75,10 @@ public class SampleTimeout extends Abstr
* No-arg constructor.
*/
public SampleTimeout() {
- debug = LOG.isDebugEnabled();
+ debug = log.isDebugEnabled();
execService = getExecutorService();
if (debug) {
- LOG.debug(whoAmI("InterruptTimer()", this));
+ log.debug(whoAmI("InterruptTimer()", this));
}
}
@@ -102,7 +102,7 @@ public class SampleTimeout extends Abstr
@Override
public void sampleStarting(Sampler sampler) {
if (debug) {
- LOG.debug(whoAmI("sampleStarting()", this));
+ log.debug(whoAmI("sampleStarting()", this));
}
createTask(sampler);
}
@@ -110,7 +110,7 @@ public class SampleTimeout extends Abstr
@Override
public void sampleEnded(final Sampler sampler) {
if (debug) {
- LOG.debug(whoAmI("sampleEnded()", this));
+ log.debug(whoAmI("sampleEnded()", this));
}
cancelTask();
}
@@ -130,10 +130,10 @@ public class SampleTimeout extends Abstr
boolean interrupted = sampler.interrupt();
String elapsed = Double.toString((double)(System.nanoTime()-start)/ 1000000000)+" secs";
if (interrupted) {
- LOG.warn("Call Done interrupting " + getInfo(samp) + " took " + elapsed);
+ log.warn("Call Done interrupting {} took {}", getInfo(samp), elapsed);
} else {
if (debug) {
- LOG.debug("Call Didn't interrupt: " + getInfo(samp) + " took " + elapsed);
+ log.debug("Call Didn't interrupt: {} took {}", getInfo(samp), elapsed);
}
}
return null;
@@ -141,21 +141,21 @@ public class SampleTimeout extends Abstr
// schedule the interrupt to occur and save for possible cancellation
future = execService.schedule(call, timeout, TimeUnit.MILLISECONDS);
if (debug) {
- LOG.debug("Scheduled timer: @" + System.identityHashCode(future) + " " + getInfo(samp));
+ log.debug("Scheduled timer: @{} {}", System.identityHashCode(future), getInfo(samp));
}
}
@Override
public void threadStarted() {
if (debug) {
- LOG.debug(whoAmI("threadStarted()", this));
+ log.debug(whoAmI("threadStarted()", this));
}
}
@Override
public void threadFinished() {
if (debug) {
- LOG.debug(whoAmI("threadFinished()", this));
+ log.debug(whoAmI("threadFinished()", this));
}
cancelTask(); // cancel future if any
}
@@ -183,7 +183,7 @@ public class SampleTimeout extends Abstr
if (!future.isDone()) {
boolean cancelled = future.cancel(false);
if (debug) {
- LOG.debug("Cancelled timer: @" + System.identityHashCode(future) + " with result " + cancelled);
+ log.debug("Cancelled timer: @{} with result {}", System.identityHashCode(future), cancelled);
}
}
future = null;
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java Wed Feb 8 12:19:15 2017
@@ -30,13 +30,13 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.testelement.property.CollectionProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.threads.JMeterVariables;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class UserParameters extends AbstractTestElement implements Serializable, PreProcessor, LoopIterationListener {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(UserParameters.class);
- private static final long serialVersionUID = 233L;
+ private static final long serialVersionUID = 234L;
public static final String NAMES = "UserParameters.names";// $NON-NLS-1$
@@ -136,7 +136,7 @@ public class UserParameters extends Abst
@Override
public void process() {
if (log.isDebugEnabled()) {
- log.debug(Thread.currentThread().getName() + " process " + isPerIteration());//$NON-NLS-1$
+ log.debug("{} process {}", Thread.currentThread().getName(), isPerIteration());//$NON-NLS-1$
}
if (!isPerIteration()) {
setValues();
@@ -147,7 +147,7 @@ public class UserParameters extends Abst
private void setValues() {
synchronized (lock) {
if (log.isDebugEnabled()) {
- log.debug(Thread.currentThread().getName() + " Running up named: " + getName());//$NON-NLS-1$
+ log.debug("{} Running up named: {}", Thread.currentThread().getName(), getName());//$NON-NLS-1$
}
PropertyIterator namesIter = getNames().iterator();
PropertyIterator valueIter = getValues().iterator();
@@ -156,7 +156,7 @@ public class UserParameters extends Abst
String name = namesIter.next().getStringValue();
String value = valueIter.next().getStringValue();
if (log.isDebugEnabled()) {
- log.debug(Thread.currentThread().getName() + " saving variable: " + name + "=" + value);//$NON-NLS-1$
+ log.debug("{} saving variable: {}={}", Thread.currentThread().getName(), name, value);//$NON-NLS-1$
}
jmvars.put(name, value);
}
@@ -169,7 +169,7 @@ public class UserParameters extends Abst
@Override
public void iterationStart(LoopIterationEvent event) {
if (log.isDebugEnabled()) {
- log.debug(Thread.currentThread().getName() + " iteration start " + isPerIteration());//$NON-NLS-1$
+ log.debug("{} iteration start {}", Thread.currentThread().getName(), isPerIteration());//$NON-NLS-1$
}
if (isPerIteration()) {
setValues();
Modified: jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/UserParametersGui.java Wed Feb 8 12:19:15 2017
@@ -51,14 +51,14 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.testelement.property.PropertyIterator;
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;
public class UserParametersGui extends AbstractPreProcessorGui {
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(UserParametersGui.class);
private static final String NAME_COL_RESOURCE = "name"; // $NON-NLS-1$
private static final String USER_COL_RESOURCE = "user"; // $NON-NLS-1$
@@ -140,12 +140,12 @@ public class UserParametersGui extends A
for (int col = 1; col < tableModel.getColumnCount(); col++) {
threadLists.addItem(tableModel.getColumnData(getUserColName(col)));
if (log.isDebugEnabled()) {
- log.debug("Adding column to threadlist: " + tableModel.getColumnData(getUserColName(col)));
- log.debug("Threadlists now = " + threadLists);
+ log.debug("Adding column to threadlist: {}", tableModel.getColumnData(getUserColName(col)));
+ log.debug("Threadlists now = {}", threadLists);
}
}
if (log.isDebugEnabled()) {
- log.debug("In the end, threadlists = " + threadLists);
+ log.debug("In the end, threadlists = {}", threadLists);
}
userParams.setThreadLists(threadLists);
userParams.setPerIteration(perIterationCheck.isSelected());
Modified: jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java Wed Feb 8 12:19:15 2017
@@ -40,8 +40,8 @@ import org.apache.commons.lang3.StringUt
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.AbstractTestElement;
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;
/**
* The model for a MailerVisualizer.
@@ -54,9 +54,9 @@ public class MailerModel extends Abstrac
NONE
}
- private static final long serialVersionUID = 270L;
+ private static final long serialVersionUID = 271L;
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(MailerModel.class);
private static final String MAIL_SMTP_HOST = "mail.smtp.host"; //$NON-NLS-1$
@@ -164,7 +164,7 @@ public class MailerModel extends Abstrac
if (theToken.indexOf('@') > 0) { //NOSONAR $NON-NLS-1$
addressList.add(theToken);
} else {
- log.warn("Ignored unexpected e-mail address: "+theToken);
+ log.warn("Ignored unexpected e-mail address: {}", theToken);
}
}
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/sampler/TestAction.java Wed Feb 8 12:19:15 2017
@@ -32,8 +32,8 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jmeter.threads.JMeterContext;
import org.apache.jmeter.threads.JMeterContextService;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Dummy Sampler used to pause or stop a thread or the test;
@@ -42,9 +42,9 @@ import org.apache.log.Logger;
*/
public class TestAction extends AbstractSampler implements Interruptible {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(TestAction.class);
- private static final long serialVersionUID = 240L;
+ private static final long serialVersionUID = 241L;
private static final Set<String> APPLIABLE_CONFIG_CLASSES = new HashSet<>(
Arrays.asList("org.apache.jmeter.config.gui.SimpleConfigGui"));
@@ -109,7 +109,7 @@ public class TestAction extends Abstract
try {
millis=Long.parseLong(timeInMillis);
} catch (NumberFormatException e){
- log.warn("Could not create number from "+timeInMillis);
+ log.warn("Could not create number from {}", timeInMillis);
millis=0;
}
try {
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/BSFTimer.java Wed Feb 8 12:19:15 2017
@@ -22,13 +22,13 @@ import org.apache.bsf.BSFException;
import org.apache.bsf.BSFManager;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.util.BSFTestElement;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BSFTimer extends BSFTestElement implements Cloneable, Timer, TestBean {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(BSFTimer.class);
- private static final long serialVersionUID = 4;
+ private static final long serialVersionUID = 5;
/** {@inheritDoc} */
@Override
@@ -44,7 +44,7 @@ public class BSFTimer extends BSFTestEle
}
delay = Long.parseLong(o.toString());
} catch (NumberFormatException | BSFException e) {
- log.warn("Problem in BSF script "+e);
+ log.warn("Problem in BSF script. {}", e.toString());
} finally {
if(mgr != null) {
mgr.terminate();
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimer.java Wed Feb 8 12:19:15 2017
@@ -21,14 +21,14 @@ package org.apache.jmeter.timers;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.util.BeanShellInterpreter;
import org.apache.jmeter.util.BeanShellTestElement;
-import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JMeterException;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class BeanShellTimer extends BeanShellTestElement implements Cloneable, Timer, TestBean {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(BeanShellTimer.class);
- private static final long serialVersionUID = 4;
+ private static final long serialVersionUID = 5;
// can be specified in jmeter.properties
private static final String INIT_FILE = "beanshell.timer.init"; //$NON-NLS-1$
@@ -55,7 +55,7 @@ public class BeanShellTimer extends Bean
ret=o.toString();
}
} catch (JMeterException e) {
- log.warn("Problem in BeanShell script "+e);
+ log.warn("Problem in BeanShell script. {}", e.toString());
}
try {
return Long.decode(ret).longValue();
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java Wed Feb 8 12:19:15 2017
@@ -34,8 +34,8 @@ import org.apache.jmeter.testelement.pro
import org.apache.jmeter.threads.AbstractThreadGroup;
import org.apache.jmeter.threads.JMeterContextService;
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 a constant throughput timer. A Constant Throughtput
@@ -47,13 +47,13 @@ import org.apache.log.Logger;
* - delay each thread according to when any thread last ran
*/
public class ConstantThroughputTimer extends AbstractTestElement implements Timer, TestStateListener, TestBean {
- private static final long serialVersionUID = 3;
+ private static final long serialVersionUID = 4;
private static class ThroughputInfo{
final Object MUTEX = new Object();
long lastScheduledTime = 0;
}
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(ConstantThroughputTimer.class);
private static final double MILLISEC_PER_MIN = 60000.0;
@@ -280,14 +280,13 @@ public class ConstantThroughputTimer ext
final String propName = e.toString();
if (objectValue.equals(rb.getObject(propName))) {
final int tmpMode = e.ordinal();
- if (log.isDebugEnabled()) {
- log.debug("Converted " + pn + "=" + objectValue + " to mode=" + tmpMode + " using Locale: " + rb.getLocale());
- }
+ log.debug("Converted {}={} to mode={} using Locale: {}", pn, objectValue, tmpMode,
+ rb.getLocale());
super.setProperty(pn, tmpMode);
return;
}
}
- log.warn("Could not convert " + pn + "=" + objectValue + " using Locale: " + rb.getLocale());
+ log.warn("Could not convert {}={} using Locale: {}", pn, objectValue, rb.getLocale());
} catch (IntrospectionException e) {
log.error("Could not find BeanInfo", e);
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java Wed Feb 8 12:19:15 2017
@@ -25,13 +25,13 @@ import javax.script.ScriptException;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.util.JSR223TestElement;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public class JSR223Timer extends JSR223TestElement implements Cloneable, Timer, TestBean {
- private static final Logger log = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(JSR223Timer.class);
- private static final long serialVersionUID = 4;
+ private static final long serialVersionUID = 5;
/** {@inheritDoc} */
@Override
@@ -46,7 +46,7 @@ public class JSR223Timer extends JSR223T
}
delay = Long.parseLong(o.toString());
} catch (NumberFormatException | IOException | ScriptException e) {
- log.error("Problem in JSR223 script "+getName(), e);
+ log.error("Problem in JSR223 script, {}", getName(), e);
}
return delay;
}
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java?rev=1782150&r1=1782149&r2=1782150&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java Wed Feb 8 12:19:15 2017
@@ -29,8 +29,8 @@ import org.apache.jmeter.testelement.Abs
import org.apache.jmeter.testelement.TestStateListener;
import org.apache.jmeter.testelement.ThreadListener;
import org.apache.jmeter.threads.JMeterContextService;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* The purpose of the SyncTimer is to block threads until X number of threads
@@ -39,7 +39,7 @@ import org.apache.log.Logger;
*
*/
public class SyncTimer extends AbstractTestElement implements Timer, Serializable, TestBean, TestStateListener, ThreadListener {
- private static final Logger LOGGER = LoggingManager.getLoggerForClass();
+ private static final Logger log = LoggerFactory.getLogger(SyncTimer.class);
/**
* Wrapper to {@link CyclicBarrier} to allow lazy init of CyclicBarrier when SyncTimer is configured with 0
@@ -134,7 +134,7 @@ public class SyncTimer extends AbstractT
}
}
- private static final long serialVersionUID = 2;
+ private static final long serialVersionUID = 3;
private transient BarrierWrapper barrier;
@@ -181,7 +181,7 @@ public class SyncTimer extends AbstractT
} catch (InterruptedException | BrokenBarrierException e) {
return 0;
} catch (TimeoutException e) {
- LOGGER.warn("SyncTimer "+ getName() + " timeouted waiting for users after:"+getTimeoutInMs()+"ms");
+ log.warn("SyncTimer {} timeouted waiting for users after: {}ms", getName(), getTimeoutInMs());
return 0;
} finally {
if(arrival == 0) {