Changeset 4576

Timestamp:

2011-01-18 13:19:36 (2 years ago)

Author:

bruno

Message:

clientmetrics: allow to produce report in current dir

Location:

trunk/global/clientmetrics/src/main/java/org/lilyproject/clientmetrics/postproc

Files:

• MetricsParser.java (modified) (2 diffs)
• MetricsReportTool.java (modified) (3 diffs)

trunk/global/clientmetrics/src/main/java/org/lilyproject/clientmetrics/postproc/MetricsParser.java

@@ -5 +5 @@
 
 import java.io.*;
+import java.util.zip.GZIPInputStream;
 
 /**
@@ -16 +17 @@
     public Tests parse(File file) throws IOException {
         InputStream is = new FileInputStream(file);
+
+        if (file.getName().endsWith(".gz")) {
+            is = new GZIPInputStream(is);
+        }
+
         try {
             return parse(is);

trunk/global/clientmetrics/src/main/java/org/lilyproject/clientmetrics/postproc/MetricsReportTool.java

@@ -8 +8 @@
 import org.joda.time.format.DateTimeFormatter;
 import org.lilyproject.cli.BaseCliTool;
+import org.lilyproject.util.ConsoleUtil;
 
 import java.io.*;
@@ -84 +85 @@
         if (outputDir.exists()) {
             System.err.println("Specified output directory already exists: " + outputDir.getAbsolutePath());
-            return 1;
+            boolean proceed = ConsoleUtil.promptYesNo("Continue anyway? [y/N]", false);
+            if (!proceed)
+                return 1;
         }
 
@@ -112 +115 @@
         writeTestsInfo(tests, outputDir);
 
-        // Include a copy of the original input metrics file in the output dir
-        System.out.println("Copy original metrics file in output directory");
-        FileUtils.copyFile(metricFile, new File(outputDir, metricFile.getName()));
+        // Include a copy of the original input metrics file in the output dir, except if the output is
+        // produced in the same directory as where the metrics file is located
+        if (!outputDir.getAbsoluteFile().getCanonicalFile().equals(metricFile.getAbsoluteFile().getParentFile().getCanonicalFile())) {
+            System.out.println("Copy original metrics file in output directory");
+            FileUtils.copyFile(metricFile, new File(outputDir, metricFile.getName()));
+        }
 
         return 0;