You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2012/08/20 23:14:13 UTC
svn commit: r1375220 - in
/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test:
JavaTest.java SleepTest.java
Author: sebb
Date: Mon Aug 20 21:14:13 2012
New Revision: 1375220
URL: http://svn.apache.org/viewvc?rev=1375220&view=rev
Log:
It's awkward reading logs where several classes share the same logger name.
Implement local LOG instances for our sample implementations
Modified:
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java?rev=1375220&r1=1375219&r2=1375220&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java Mon Aug 20 21:14:13 2012
@@ -26,6 +26,8 @@ import org.apache.jmeter.protocol.java.s
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.TestElement;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
/**
* The <code>JavaTest</code> class is a simple sampler which is intended for
@@ -65,6 +67,9 @@ import org.apache.jmeter.testelement.Tes
*/
public class JavaTest extends AbstractJavaSamplerClient implements Serializable {
+
+ private static final Logger LOG = LoggingManager.getLoggerForClass();
+
private static final long serialVersionUID = 240L;
/** The base number of milliseconds to sleep during each sample. */
@@ -151,7 +156,7 @@ public class JavaTest extends AbstractJa
* of the client class.
*/
public JavaTest() {
- getLogger().debug(whoAmI() + "\tConstruct");
+ LOG.debug(whoAmI() + "\tConstruct");
}
/*
@@ -190,8 +195,8 @@ public class JavaTest extends AbstractJa
*/
@Override
public void setupTest(JavaSamplerContext context) {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug(whoAmI() + "\tsetupTest()");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(whoAmI() + "\tsetupTest()");
listParameters(context);
}
}
@@ -297,18 +302,18 @@ public class JavaTest extends AbstractJa
}
results.setSuccessful(success);
} catch (InterruptedException e) {
- getLogger().warn("JavaTest: interrupted.");
+ LOG.warn("JavaTest: interrupted.");
results.setSuccessful(true);
} catch (Exception e) {
- getLogger().error("JavaTest: error during sample", e);
+ LOG.error("JavaTest: error during sample", e);
results.setSuccessful(false);
} finally {
// Record end time and populate the results.
results.sampleEnd();
}
- if (getLogger().isDebugEnabled()) {
- getLogger().debug(whoAmI() + "\trunTest()" + "\tTime:\t" + results.getTime());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(whoAmI() + "\trunTest()" + "\tTime:\t" + results.getTime());
listParameters(context);
}
@@ -325,8 +330,8 @@ public class JavaTest extends AbstractJa
*/
@Override
public void teardownTest(JavaSamplerContext context) {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug(whoAmI() + "\tteardownTest()");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(whoAmI() + "\tteardownTest()");
listParameters(context);
}
}
@@ -342,7 +347,7 @@ public class JavaTest extends AbstractJa
Iterator<String> argsIt = context.getParameterNamesIterator();
while (argsIt.hasNext()) {
String name = argsIt.next();
- getLogger().debug(name + "=" + context.getParameter(name));
+ LOG.debug(name + "=" + context.getParameter(name));
}
}
Modified: jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java?rev=1375220&r1=1375219&r2=1375220&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java (original)
+++ jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/test/SleepTest.java Mon Aug 20 21:14:13 2012
@@ -24,6 +24,8 @@ import org.apache.jmeter.config.Argument
import org.apache.jmeter.protocol.java.sampler.AbstractJavaSamplerClient;
import org.apache.jmeter.protocol.java.sampler.JavaSamplerContext;
import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
/**
* The <code>SleepTest</code> class is a simple example class for a JMeter
@@ -44,6 +46,9 @@ import org.apache.jmeter.samplers.Sample
* @version $Revision$
*/
public class SleepTest extends AbstractJavaSamplerClient implements Serializable {
+
+ private static final Logger LOG = LoggingManager.getLoggerForClass();
+
private static final long serialVersionUID = 240L;
/**
@@ -74,7 +79,7 @@ public class SleepTest extends AbstractJ
* of the client class.
*/
public SleepTest() {
- getLogger().debug(whoAmI() + "\tConstruct");
+ LOG.debug(whoAmI() + "\tConstruct");
}
/**
@@ -91,8 +96,8 @@ public class SleepTest extends AbstractJ
*/
@Override
public void setupTest(JavaSamplerContext context) {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug(whoAmI() + "\tsetupTest()");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(whoAmI() + "\tsetupTest()");
listParameters(context);
}
sleepTime = context.getLongParameter("SleepTime", DEFAULT_SLEEP_TIME);
@@ -143,17 +148,17 @@ public class SleepTest extends AbstractJ
results.setSuccessful(true);
} catch (InterruptedException e) {
- getLogger().warn("SleepTest: interrupted.");
+ LOG.warn("SleepTest: interrupted.");
results.setSuccessful(true);
} catch (Exception e) {
- getLogger().error("SleepTest: error during sample", e);
+ LOG.error("SleepTest: error during sample", e);
results.setSuccessful(false);
} finally {
results.sampleEnd();
}
- if (getLogger().isDebugEnabled()) {
- getLogger().debug(whoAmI() + "\trunTest()" + "\tTime:\t" + results.getTime());
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(whoAmI() + "\trunTest()" + "\tTime:\t" + results.getTime());
listParameters(context);
}
@@ -170,8 +175,8 @@ public class SleepTest extends AbstractJ
*/
@Override
public void teardownTest(JavaSamplerContext context) {
- if (getLogger().isDebugEnabled()) {
- getLogger().debug(whoAmI() + "\tteardownTest()");
+ if (LOG.isDebugEnabled()) {
+ LOG.debug(whoAmI() + "\tteardownTest()");
listParameters(context);
}
}
@@ -206,7 +211,7 @@ public class SleepTest extends AbstractJ
Iterator<String> argsIt = context.getParameterNamesIterator();
while (argsIt.hasNext()) {
String name = argsIt.next();
- getLogger().debug(name + "=" + context.getParameter(name));
+ LOG.debug(name + "=" + context.getParameter(name));
}
}