[#1967] fix broken monitor statistics in status - make the code more …

…future-proof as well
playframework · Aug 10, 2015 · fd68d74 · fd68d74
1 parent 771cf1b
commit fd68d74
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/framework/src/play/CorePlugin.java b/framework/src/play/CorePlugin.java
@@ -3,12 +3,13 @@
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonPrimitive;
+import com.jamonapi.Monitor;
 import com.jamonapi.MonitorFactory;
 import com.jamonapi.utils.Misc;
 import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.text.SimpleDateFormat;
-import java.util.Date;
+import java.util.*;
 
 import org.apache.commons.lang.StringUtils;
 import play.Play.Mode;
@@ -26,6 +27,8 @@
 import play.mvc.Http.Request;
 import play.mvc.Http.Response;
 
+import static java.util.Arrays.asList;
+
 /**
  * Plugin used for core tasks
  */
@@ -170,20 +173,26 @@ public String getStatus() {
         try {
             out.println("Monitors:");
             out.println("~~~~~~~~");
-            Object[][] data = Misc.sort(MonitorFactory.getRootMonitor().getBasicData(), 3, "desc");
+            List<Monitor> monitors = new ArrayList<Monitor>(asList(MonitorFactory.getRootMonitor().getMonitors()));
+            Collections.sort(monitors, new Comparator<Monitor>() {
+                @Override public int compare(Monitor m1, Monitor m2) {
+                    return Double.compare(m2.getTotal(), m1.getTotal());
+                }
+            });
             int lm = 10;
-            for (Object[] row : data) {
-                if (row[0].toString().length() > lm) {
-                    lm = row[0].toString().length();
+            for (Monitor monitor : monitors) {
+                if (monitor.getLabel().length() > lm) {
+                    lm = monitor.getLabel().length();
                 }
             }
-            for (Object[] row : data) {
-                if (((Double) row[1]) > 0) {
-                    out.println(String.format("%-" + (lm) + "s -> %8.0f hits; %8.1f avg; %8.1f min; %8.1f max;", row[0], row[1], row[2], row[6], row[7]));
+            for (Monitor monitor : monitors) {
+                if (monitor.getHits() > 0) {
+                    out.println(String.format("%-" + lm + "s -> %8.0f hits; %8.1f avg; %8.1f min; %8.1f max;",
+                        monitor.getLabel(), monitor.getHits(), monitor.getAvg(), monitor.getMin(), monitor.getMax()));
                 }
             }
         } catch (Exception e) {
-            out.println("No monitors found");
+            out.println("No monitors found: " + e);
         }
         return sw.toString();
     }