Merge pull request #465 from xxxllluuu/master

fix issue 464
uavorg · Dec 21, 2018 · a442483 · a442483
2 parents 991ed36 + d15c921
commit a442483
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 130 deletions.
diff --git a/com.creditease.uav.agent.buildComponent/bin/run4docker.sh b/com.creditease.uav.agent.buildComponent/bin/run4docker.sh
diff --git a/com.creditease.uav.agent.buildComponent/bin/run4k8s.sh b/com.creditease.uav.agent.buildComponent/bin/run4k8s.sh
diff --git a/com.creditease.uav.agent.buildComponent/bin/start_ma_pro_docker.sh b/com.creditease.uav.agent.buildComponent/bin/start_ma_pro_docker.sh
diff --git a/com.creditease.uav.agent.buildComponent/bin/start_ma_pro_k8s.sh b/com.creditease.uav.agent.buildComponent/bin/start_ma_pro_k8s.sh
diff --git a/com.creditease.uav.agent.buildComponent/bin/start_ma_test_docker.sh b/com.creditease.uav.agent.buildComponent/bin/start_ma_test_docker.sh
diff --git a/com.creditease.uav.agent.buildComponent/bin/start_ma_test_k8s.sh b/com.creditease.uav.agent.buildComponent/bin/start_ma_test_k8s.sh
diff --git a/...java/com/creditease/uav/feature/healthmanager/datastore/adaptors/NodeInfoDataAdapter.java b/...java/com/creditease/uav/feature/healthmanager/datastore/adaptors/NodeInfoDataAdapter.java
@@ -25,8 +25,11 @@
 import java.util.List;
 import java.util.Map;
 
+import org.aredis.cache.StringHandler;
+
 import com.creditease.agent.helpers.DataStoreHelper;
 import com.creditease.agent.helpers.JSONHelper;
+import com.creditease.agent.helpers.StringHelper;
 import com.creditease.agent.monitor.api.MonitorDataFrame;
 import com.creditease.uav.datastore.api.DataStoreAdapter;
 import com.creditease.uav.datastore.api.DataStoreConnection;
@@ -196,8 +199,8 @@ private Map<String, String> createTags(MonitorDataFrame mdf, String instanceId,
         }
         else if (meId.indexOf("procState") == 0) {
             String temp[] = instanceId.split("_");
-            if ((temp[1].equals("java") || temp[1].equals("javaw.exe") || temp[1].equals("java.exe"))
-                    && fields.get("main") != null) {
+            if (("java".equals(temp[1]) || "javaw.exe".equals(temp[1]) || "java.exe".equals(temp[1]))
+                    && !StringHelper.isEmpty((String)fields.get("main"))) {
 
                 String mainClass = (String) fields.get("main");
                 // group Id :for java, pgid is main class