jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmoua...@apache.org
Subject svn commit: r1742744 - /jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java
Date Sat, 07 May 2016 20:00:19 GMT
Author: pmouawad
Date: Sat May  7 20:00:18 2016
New Revision: 1742744

URL: http://svn.apache.org/viewvc?rev=1742744&view=rev
Log:
Add logging and contextual info

Modified:
    jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java?rev=1742744&r1=1742743&r2=1742744&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/ReportGenerator.java Sat May
 7 20:00:18 2016
@@ -140,7 +140,14 @@ public class ReportGenerator {
         this.resultCollector = resultCollector;
         this.testFile = file;
         final Properties merged = new Properties();
-        merged.putAll(loadProps(new File(JMeterUtils.getJMeterBinDir(), REPORTGENERATOR_PROPERTIES)));
+        File rgp = new File(JMeterUtils.getJMeterBinDir(), REPORTGENERATOR_PROPERTIES);
+        if(LOG.isInfoEnabled()) {
+            LOG.info("Reading report generator properties from:"+rgp.getAbsolutePath());
+        }
+        merged.putAll(loadProps(rgp));
+        if(LOG.isInfoEnabled()) {
+            LOG.info("Merging with JMeter properties");
+        }
         merged.putAll(JMeterUtils.getJMeterProperties());
         configuration = ReportGeneratorConfiguration.loadFromProperties(merged);
     }
@@ -150,7 +157,7 @@ public class ReportGenerator {
         try (FileInputStream inStream = new FileInputStream(file)) {
             props.load(inStream);
         } catch (IOException e) {
-            LOG.error("Problem loading properties ", e);
+            LOG.error("Problem loading properties from file:"+file.getAbsolutePath(), e);
             System.err.println("Problem loading properties " + e);
         }
         return props;



Mime
View raw message