refactor property action

Author: yunheli

platform-agent/src/main/java/com/flow/platform/agent/CmdManager.java

@@ -26,19 +26,14 @@
 import com.flow.platform.domain.CmdStatus;
 import com.flow.platform.domain.CmdType;
 import com.flow.platform.domain.Jsonable;
-import com.flow.platform.util.ExceptionUtil;
 import com.flow.platform.util.Logger;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import java.io.FileInputStream;
-import java.io.InputStream;
-import java.net.URL;
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.LinkedBlockingQueue;
@@ -254,15 +249,7 @@ private String collectionAgentInfo() {
         dic.put("useMemory", use / kb + "MB");
         dic.put("zone", Config.zone());
         dic.put("name", Config.name());
-        URL resource = this.getClass().getClassLoader().getResource("application.properties");
-        try {
-            InputStream fileInputStream = new FileInputStream(resource.getFile());
-            Properties properties = new Properties();
-            properties.load(fileInputStream);
-            dic.put("agentVersion", (String) properties.get("version"));
-        } catch (Throwable e) {
-            LOGGER.warn("read agent version from application.properties error %s", ExceptionUtil.findRootCause(e));
-        }
+        dic.put("agentVersion", Config.getProperty("version"));
         return Jsonable.GSON_CONFIG.toJson(dic);
     }
 

platform-agent/src/main/java/com/flow/platform/agent/Config.java

@@ -21,8 +21,12 @@
 import com.flow.platform.util.http.HttpClient;
 import com.flow.platform.util.http.HttpResponse;
 import com.flow.platform.util.zk.ZKClient;
+import java.io.FileInputStream;
+import java.io.InputStream;
+import java.net.URL;
 import java.nio.file.Path;
 import java.nio.file.Paths;
+import java.util.Properties;
 import org.apache.curator.utils.ZKPaths;
 
 /**
@@ -50,6 +54,8 @@ public class Config {
     public static String ZONE;
     public static String NAME;
 
+    private static Properties properties;
+
     public static boolean isDebug() {
         String boolStr = System.getProperty(PROP_IS_DEBUG, "false");
         return Boolean.parseBoolean(boolStr);
@@ -60,6 +66,27 @@ public static int zkTimeout() {
         return Integer.parseInt(intStr);
     }
 
+    /**
+     * get property from application.properties
+     * @param name
+     * @return
+     */
+    public static String getProperty(String name) {
+        String value;
+        URL resource = Config.class.getClassLoader().getResource("application.properties");
+        if (properties == null) {
+            try (InputStream fileInputStream = new FileInputStream(resource.getFile())) {
+                properties = new Properties();
+                properties.load(fileInputStream);
+            } catch (Throwable e) {
+            }
+        }
+
+        value = properties.getProperty(name);
+
+        return value;
+    }
+
     /**
      * Is delete cmd log after uploaded
      */