From 3d738e8d6b6aecbddd525e234e0172ca341ece56 Mon Sep 17 00:00:00 2001
From: laudukang <751611201@qq.com>
Date: Tue, 23 May 2017 21:46:08 +0800
Subject: [PATCH 1/2] support manually set monitor identity

---
 .../java/com/github/ltsopensource/monitor/MonitorAgent.java  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lts-monitor/src/main/java/com/github/ltsopensource/monitor/MonitorAgent.java b/lts-monitor/src/main/java/com/github/ltsopensource/monitor/MonitorAgent.java
index 14d8af1fa..2cab59f19 100644
--- a/lts-monitor/src/main/java/com/github/ltsopensource/monitor/MonitorAgent.java
+++ b/lts-monitor/src/main/java/com/github/ltsopensource/monitor/MonitorAgent.java
@@ -117,7 +117,10 @@ private void intConfig() {
         if (StringUtils.isEmpty(config.getIp())) {
             config.setIp(NetUtils.getLocalHost());
         }
-        JobNodeConfigFactory.buildIdentity(config);
+
+        if (StringUtils.isEmpty(config.getIdentity())) {
+            JobNodeConfigFactory.buildIdentity(config);
+        }
 
         // 初始化一些 db access
         MonitorAccessFactory factory = ServiceLoader.load(MonitorAccessFactory.class, config);

From 12835d7aa98faf822a3cb1c7190c15c8dc6b4a27 Mon Sep 17 00:00:00 2001
From: laudukang <751611201@qq.com>
Date: Fri, 26 May 2017 17:08:09 +0800
Subject: [PATCH 2/2] spring boot load config support

---
 .../monitor/MonitorCfgLoader.java             | 39 ++++++++++++-------
 1 file changed, 24 insertions(+), 15 deletions(-)

diff --git a/lts-monitor/src/main/java/com/github/ltsopensource/monitor/MonitorCfgLoader.java b/lts-monitor/src/main/java/com/github/ltsopensource/monitor/MonitorCfgLoader.java
index 60156cacb..dd384eb8a 100644
--- a/lts-monitor/src/main/java/com/github/ltsopensource/monitor/MonitorCfgLoader.java
+++ b/lts-monitor/src/main/java/com/github/ltsopensource/monitor/MonitorCfgLoader.java
@@ -1,11 +1,11 @@
 package com.github.ltsopensource.monitor;
 
-import com.github.ltsopensource.core.commons.file.FileUtils;
 import com.github.ltsopensource.core.commons.utils.Assert;
 import com.github.ltsopensource.core.commons.utils.StringUtils;
-import org.apache.log4j.PropertyConfigurator;
 
-import java.io.*;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Properties;
@@ -17,21 +17,30 @@ public class MonitorCfgLoader {
 
     public static MonitorCfg load(String confPath) {
 
-        String cfgPath = confPath + "/lts-monitor.cfg";
-        String log4jPath = confPath + "/log4j.properties";
+
+        String monitorConfigName = "lts-monitor.cfg";
+        String cfgPath = confPath + File.separator + monitorConfigName;
+
+//        String log4jConfigName = "log4j.properties";
+//        String log4jPath = confPath + File.separator + log4jConfigName;
 
         Properties conf = new Properties();
-        File file = new File(cfgPath);
         InputStream is = null;
+
         try {
-            is = new FileInputStream(file);
-        } catch (FileNotFoundException e) {
-            throw new CfgException("can not find " + cfgPath);
-        }
-        try {
+            is = MonitorCfgLoader.class.getClassLoader().getResourceAsStream(monitorConfigName);
             conf.load(is);
         } catch (IOException e) {
+            e.printStackTrace();
             throw new CfgException("Read " + cfgPath + " error.", e);
+        }finally {
+            try {
+                if (null != is) {
+                    is.close();
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
         }
 
         MonitorCfg cfg = new MonitorCfg();
@@ -68,10 +77,10 @@ public static MonitorCfg load(String confPath) {
             throw new CfgException(e);
         }
 
-        if (FileUtils.exist(log4jPath)) {
-            //  log4j 配置文件路径
-            PropertyConfigurator.configure(log4jPath);
-        }
+//        if (FileUtils.exist(log4jPath)) {
+//            //  log4j 配置文件路径
+//            PropertyConfigurator.configure(log4jPath);
+//        }
 
         return cfg;
     }