svn commit: r1731944 - in /jmeter/trunk/src/core/org/apache/jmeter/report: config/ReportGeneratorConfiguration.java dashboard/ReportGenerator.java

[pm...@apache.org]

Author: pmouawad
Date: Tue Feb 23 20:24:37 2016
New Revision: 1731944

URL: http://svn.apache.org/viewvc?rev=1731944&view=rev
Log:
Add more debugging

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

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java?rev=1731944&r1=1731943&r2=1731944&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/config/ReportGeneratorConfiguration.java Tue Feb 23 20:24:37 2016
@@ -131,6 +131,9 @@ public class ReportGeneratorConfiguratio
                     getExporterPropertyKey(exportId,
                             SUBCONF_KEY_CLASSNAME), "",
                     String.class);
+            if(LOG.isDebugEnabled()) {
+                LOG.debug("Using class:'"+className+"'"+" for exporter:'"+exportId+"'");
+            }
             exportConfiguration.setClassName(className);
 
             // Get the property defining whether only sample series
@@ -233,6 +236,9 @@ public class ReportGeneratorConfiguratio
                     getGraphPropertyKey(graphId,
                             SUBCONF_KEY_CLASSNAME), "",
                     String.class);
+            if(LOG.isDebugEnabled()) {
+                LOG.debug("Using class:'"+className+"' for graph:'"+title+"' with id:'"+graphId+"'");
+            }
             graphConfiguration.setClassName(className);
 
         }
@@ -587,6 +593,9 @@ public class ReportGeneratorConfiguratio
 
         // Use jodd.Props to ease property handling
         final Props props = new Props();
+        if(LOG.isDebugEnabled()) {
+            LOG.debug("Loading properties:\r\n"+properties);
+        }
         props.load(properties);
 
         // Load temporary directory property
@@ -633,7 +642,7 @@ public class ReportGeneratorConfiguratio
                 new ExporterConfigurationFactory(props));
 
         if (exportConfigurations.isEmpty()) {
-            LOG.warn("No export configuration found. None report will be generated.");
+            LOG.warn("No export configuration found. No report will be generated.");
         }
 
         LOG.debug(END_LOADING_MSG);

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=1731944&r1=1731943&r2=1731944&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 Tue Feb 23 20:24:37 2016
@@ -73,6 +73,9 @@ public class ReportGenerator {
             .equalsIgnoreCase(JMeterUtils.getPropDefault(
                     "jmeter.save.saveservice.output_format", "csv"));
 
+    private static final char CSV_DEFAULT_SEPARATOR =
+            JMeterUtils.getPropDefault("jmeter.save.saveservice.default_delimiter", ",").charAt(0); //$NON-NLS-1$ //$NON-NLS-2$
+
     private static final String INVALID_CLASS_FMT = "Class name \"%s\" is not valid.";
     private static final String INVALID_EXPORT_FMT = "Data exporter \"%s\" is unable to export data.";
     private static final String NOT_SUPPORTED_CONVERTION_FMT = "Not supported conversion to \"%s\"";
@@ -113,6 +116,8 @@ public class ReportGenerator {
                     "Report generation requires csv output format, check 'jmeter.save.saveservice.output_format' property");
         }
 
+        LOG.info("ReportGenerator will use for Parsing the separator:'"+CSV_DEFAULT_SEPARATOR+"'");
+
         File file = new File(resultsFile);
         if (resultCollector == null) {
             if (!(file.isFile() && file.canRead())) {
@@ -223,6 +228,8 @@ public class ReportGenerator {
         // Process configuration to build data exporters
         for (Map.Entry<String, ExporterConfiguration> entry : configuration
                 .getExportConfigurations().entrySet()) {
+            LOG.info("Exporting data using exporter:'"
+                +entry.getKey()+"' of className:'"+entry.getValue().getClassName()+"'");
             exportData(sampleContext, entry.getKey(), entry.getValue());
         }