[jbosscache-commits] JBoss Cache SVN: r5016 - cache-bench-fwk/trunk/src/org/cachebench/reportgenerators.

[jbosscache-commits at lists.jboss.org]

Author: mircea.markus
Date: 2008-01-06 17:48:42 -0500 (Sun, 06 Jan 2008)
New Revision: 5016

Modified:
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGenerator.java
   cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java
Log:


Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java	2008-01-06 22:35:59 UTC (rev 5015)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java	2008-01-06 22:48:42 UTC (rev 5016)
@@ -28,6 +28,7 @@
       {
          return "performance-" + clusterConfig.getClusterSize() + ".csv";
       }
+      log.info("Filename for report generation is: " + fileName);
       return fileName;
    }
 

Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGenerator.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGenerator.java	2008-01-06 22:35:59 UTC (rev 5015)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/CSVReportGenerator.java	2008-01-06 22:48:42 UTC (rev 5016)
@@ -30,23 +30,34 @@
 
    public void generate() throws Exception
    {
-      BufferedWriter writer = null;
-      log.debug("Opening output file [" + output + "]");
-      writer = new BufferedWriter(new FileWriter(output));
-      writeHeaderLine(writer); // Write the Header of the Report
-      // Write the results
-      for (TestResult result : results)
+      try
       {
-         writeTestResult(result, writer);
-      }
-      // Write the Footnotes (if available)
-      if (footNotes != null)
+         BufferedWriter writer = null;
+         log.debug("Opening output file [" + output + "]");
+         writer = new BufferedWriter(new FileWriter(output));
+         writeHeaderLine(writer); // Write the Header of the Report
+         // Write the results
+         for (TestResult result : results)
+         {
+            writeTestResult(result, writer);
+         }
+         // Write the Footnotes (if available)
+         if (footNotes != null)
+         {
+            writeFoodNotes(writer);
+         }
+
+         writer.close();
+         log.debug("Report complete");
+         if  (output.exists())
+         {
+            log.error("Expected report file:'" + output.getAbsoluteFile() + "'does not exist!");
+            throw new IllegalStateException("The report file does not exist - weird!");
+         }
+      } catch (IOException e)
       {
-         writeFoodNotes(writer);
+         log.error("Error appeared while generatin report:", e);
       }
-
-      writer.close();
-      log.debug("Report complete");
    }
 
    /**

Modified: cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java
===================================================================
--- cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java	2008-01-06 22:35:59 UTC (rev 5015)
+++ cache-bench-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java	2008-01-06 22:48:42 UTC (rev 5016)
@@ -37,6 +37,7 @@
          log.trace(" Starting generating. Is master? " + clusterConfig.isMaster());
          if (clusterConfig.isMaster())
          {
+            log.info("Master node, generating report");
             log.trace("Received following results: " + results);
             generateReport(barrier.getReceivedMessages());
          }