Merge pull request #398 from ddh27/master

Custom metrics display updates
uavorg · Sep 14, 2018 · 2950e06 · 2950e06
2 parents 46cb891 + 086b274
commit 2950e06
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/...a/com/creditease/agent/feature/monitoragent/datacatch/BaseHttpMonitorDataCatchWorker.java b/...a/com/creditease/agent/feature/monitoragent/datacatch/BaseHttpMonitorDataCatchWorker.java
@@ -27,6 +27,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Properties;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
@@ -121,6 +122,18 @@ public void run() {
                 }
             }
 
+            // up to date SystemProperties
+            String getSysUrl = this.appServerInfo.getJVMAccessURL() + "jvm?action=getSystemPro";
+            String data = accessData(getSysUrl, null);
+            @SuppressWarnings("unchecked")
+            Map<String, String> p = JSONHelper.toObject(data, Map.class);
+
+            Properties sysPro = new Properties();
+            if (!p.isEmpty()) {
+                sysPro.putAll(p);
+                this.appServerInfo.setSystemProperties(sysPro);
+            }
+
             // get all profile's MBean
             MonitorDataFrame pmdf = new MonitorDataFrame(this.getWorkerId(), "P", timeFlag);
             pmdf.addExt("pid", pid);
@@ -153,6 +166,9 @@ public void run() {
             // if connect fails, try process detecting
             doHealthReaction();
         }
+        catch (Exception e) {
+            log.err(this, "up to date SystemProperties failed", e);
+        }
     }
 
     /**