You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by fs...@apache.org on 2019/08/16 08:13:28 UTC
[jmeter] 03/06: Fix Log messages
This is an automated email from the ASF dual-hosted git repository.
fschumacher pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 8ba1e935107c88f97052c9dedd00de3c2dc0fa08
Author: Graham Russell <gr...@ham1.co.uk>
AuthorDate: Thu Aug 15 10:26:39 2019 +0100
Fix Log messages
Part of #479 on github
---
.../src/main/java/org/apache/jmeter/assertions/BSFAssertion.java | 4 +---
.../main/java/org/apache/jmeter/assertions/BeanShellAssertion.java | 6 ++----
.../apache/jmeter/report/config/ReportGeneratorConfiguration.java | 5 ++---
.../java/org/apache/jmeter/report/dashboard/TemplateVisitor.java | 5 +++--
.../src/main/java/org/apache/jmeter/functions/CSVRead.java | 2 +-
5 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java
index d950c14..05fdd99 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/BSFAssertion.java
@@ -43,9 +43,7 @@ public class BSFAssertion extends BSFTestElement implements Cloneable, Assertion
processFileOrScript(mgr);
result.setError(false);
} catch (BSFException e) {
- if (log.isWarnEnabled()) {
- log.warn("Problem in BSF script {}", e.toString());
- }
+ log.warn("Problem in BSF script", e);
result.setFailure(true);
result.setError(true);
result.setFailureMessage(e.toString());
diff --git a/src/components/src/main/java/org/apache/jmeter/assertions/BeanShellAssertion.java b/src/components/src/main/java/org/apache/jmeter/assertions/BeanShellAssertion.java
index b3ca680..c0e1681 100644
--- a/src/components/src/main/java/org/apache/jmeter/assertions/BeanShellAssertion.java
+++ b/src/components/src/main/java/org/apache/jmeter/assertions/BeanShellAssertion.java
@@ -112,7 +112,7 @@ public class BeanShellAssertion extends BeanShellTestElement implements Assertio
result.setError(false);
}
catch (NoClassDefFoundError ex) { // NOSONAR explicitly trap this error to make tests work better
- log.error("BeanShell Jar missing? " + ex.toString());
+ log.error("BeanShell Jar missing?", ex);
result.setError(true);
result.setFailureMessage("BeanShell Jar missing? " + ex.toString());
response.setStopThread(true); // No point continuing
@@ -120,9 +120,7 @@ public class BeanShellAssertion extends BeanShellTestElement implements Assertio
{
result.setError(true);
result.setFailureMessage(ex.toString());
- if (log.isWarnEnabled()) {
- log.warn(ex.toString());
- }
+ log.warn("Error in BeanShellAssertion", ex);
}
return result;
diff --git a/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
index 84bc8d1..78ac34b 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
@@ -730,9 +730,8 @@ public class ReportGeneratorConfiguration {
public static Map<String, Long[]> getApdexPerTransactionParts(String apdexPerTransaction) {
Map <String, Long[]> specificApdexes = new HashMap<>();
if (StringUtils.isEmpty(apdexPerTransaction) ||
- apdexPerTransaction.trim().length()==0) {
- log.info(
- "apdex_per_transaction : {} is empty, not APDEX per transaction customization");
+ apdexPerTransaction.trim().length() == 0) {
+ log.info("apdex_per_transaction is empty, not APDEX per transaction customization");
} else {
// data looks like : sample(\d+):1000|2000;samples12:3000|4000;scenar01-12:5000|6000
String[] parts = apdexPerTransaction.split("[;]");
diff --git a/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
index 6e2be00..95e7efc 100644
--- a/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
+++ b/src/core/src/main/java/org/apache/jmeter/report/dashboard/TemplateVisitor.java
@@ -89,8 +89,9 @@ public class TemplateVisitor extends SimpleFileVisitor<Path> {
try {
Files.copy(file, newDir);
} catch (FileAlreadyExistsException ex) {
- LOGGER.info("Copying folder from '{}' to '{}', got message:{}, found non empty folder with following content {}, will be ignored",
- file, newDir, newDir.toFile().listFiles());
+ LOGGER.info("Copying folder from '{}' to '{}', got message: " +
+ "{}, found non empty folder with following content {}, will be ignored",
+ file, newDir, ex.getMessage(), newDir.toFile().listFiles());
}
return FileVisitResult.CONTINUE;
}
diff --git a/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java b/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java
index 67fa80c..820d1f7 100644
--- a/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java
+++ b/src/functions/src/main/java/org/apache/jmeter/functions/CSVRead.java
@@ -121,7 +121,7 @@ public class CSVRead extends AbstractFunction {
FileWrapper.getCurrentRow(fileName), e.toString());
}
- log.debug("execute value: {}");
+ log.debug("execute value: {}", myValue);
return myValue;
}