Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

support manually set monitor identity #379

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

support manually set monitor identity #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3d738e8
support manually set monitor identity
laudukang May 23, 2017
12835d7
spring boot load config support
laudukang May 26, 2017
d7d4df1
Merge branch 'master' of github.com:ltsopensource/light-task-scheduler
laudukang Jun 13, 2017
76c7fad
Merge branch 'master' of git.oschina.net:laudukang/light-task-scheduler
laudukang Sep 8, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion lts-monitor/src/main/java/com/github/ltsopensource/monitor/MonitorAgent.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
39 changes: 24 additions & 15 deletions lts-monitor/src/main/java/com/github/ltsopensource/monitor/MonitorCfgLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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();
Expand Down Expand Up @@ -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;
}
Expand Down