Skip to content

Commit 4ae1c6c

Browse files
qq254963746qq254963746
committed
Merge pull request #280 from ltsopensource/develop
整理ExtConfig
2 parents 4f58c14 + c8659ae commit 4ae1c6c

File tree

44 files changed

+340
-202
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+340
-202
lines changed

‎lts-admin/src/main/java/com/github/ltsopensource/admin/access/BackendAccessFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import com.github.ltsopensource.admin.access.face.*;
44
import com.github.ltsopensource.core.cluster.Config;
5+
import com.github.ltsopensource.core.constant.ExtConfig;
56
import com.github.ltsopensource.core.spi.SPI;
6-
import com.github.ltsopensource.core.spi.SpiExtensionKey;
77

88
/**
99
* @author Robert HG (254963746@qq.com) on 3/9/16.
1010
*/
11-
@SPI(key = SpiExtensionKey.ACCESS_DB, dftValue = "mysql")
11+
@SPI(key = ExtConfig.ACCESS_DB, dftValue = "mysql")
1212
public interface BackendAccessFactory {
1313

1414
BackendJobTrackerMAccess getJobTrackerMAccess(Config config);

‎lts-admin/src/main/java/com/github/ltsopensource/admin/support/SystemInitListener.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
import com.github.ltsopensource.core.commons.utils.PlatformUtils;
55
import com.github.ltsopensource.core.commons.utils.StringUtils;
66
import com.github.ltsopensource.core.compiler.AbstractCompiler;
7-
import com.github.ltsopensource.core.constant.Constants;
7+
import com.github.ltsopensource.core.constant.ExtConfig;
88
import com.github.ltsopensource.core.json.JSONFactory;
99
import com.github.ltsopensource.core.logger.LoggerFactory;
10-
import com.github.ltsopensource.core.spi.SpiExtensionKey;
1110
import com.github.ltsopensource.monitor.MonitorAgentStartup;
1211
import org.apache.log4j.PropertyConfigurator;
1312

@@ -28,17 +27,17 @@ public void contextInitialized(ServletContextEvent servletContextEvent) {
2827
}
2928
AppConfigurer.load(confPath);
3029

31-
String compiler = AppConfigurer.getProperty("configs." + Constants.COMPILER);
30+
String compiler = AppConfigurer.getProperty("configs." + ExtConfig.COMPILER);
3231
if (StringUtils.isNotEmpty(compiler)) {
3332
AbstractCompiler.setCompiler(compiler);
3433
}
3534

36-
String jsonAdapter = AppConfigurer.getProperty("configs." + SpiExtensionKey.LTS_JSON);
35+
String jsonAdapter = AppConfigurer.getProperty("configs." + ExtConfig.LTS_JSON);
3736
if (StringUtils.isNotEmpty(jsonAdapter)) {
3837
JSONFactory.setJSONAdapter(jsonAdapter);
3938
}
4039

41-
String loggerAdapter = AppConfigurer.getProperty("configs." + SpiExtensionKey.LTS_LOGGER);
40+
String loggerAdapter = AppConfigurer.getProperty("configs." + ExtConfig.LTS_LOGGER);
4241
if (StringUtils.isNotEmpty(loggerAdapter)) {
4342
LoggerFactory.setLoggerAdapter(loggerAdapter);
4443
}

‎lts-admin/src/main/java/com/github/ltsopensource/admin/web/support/NoRelyJobGenerator.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.ltsopensource.admin.web.support;
22

33
import com.github.ltsopensource.admin.cluster.BackendAppContext;
4+
import com.github.ltsopensource.core.constant.ExtConfig;
45
import com.github.ltsopensource.queue.domain.JobPo;
56
import com.github.ltsopensource.queue.support.NonRelyJobUtils;
67

@@ -16,7 +17,7 @@ public class NoRelyJobGenerator {
1617

1718
public NoRelyJobGenerator(BackendAppContext appContext) {
1819
this.appContext = appContext;
19-
this.scheduleIntervalMinute = this.appContext.getConfig().getParameter("jobtracker.nonRelyOnPrevCycleJob.schedule.interval.minute", 10);
20+
this.scheduleIntervalMinute = this.appContext.getConfig().getParameter(ExtConfig.JOB_TRACKER_NON_RELYON_PREV_CYCLE_JOB_SCHEDULER_INTERVAL_MINUTE, 10);
2021

2122
}
2223

‎lts-core/src/main/java/com/github/ltsopensource/alarm/email/EmailAlarmNotifier.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import com.github.ltsopensource.alarm.AlarmNotifyException;
55
import com.github.ltsopensource.core.AppContext;
66
import com.github.ltsopensource.core.cluster.Config;
7+
import com.github.ltsopensource.core.constant.ExtConfig;
78

89
/**
910
* @author Robert HG (254963746@qq.com) on 2/17/16.
@@ -18,12 +19,12 @@ public EmailAlarmNotifier(AppContext appContext) {
1819

1920
private MailManager getMailManager(AppContext appContext) {
2021
Config config = appContext.getConfig();
21-
String host = config.getParameter("mail.smtp.host");
22-
String port = config.getParameter("mail.smtp.port");
23-
String userName = config.getParameter("mail.username");
24-
String password = config.getParameter("mail.password");
25-
String adminAddress = config.getParameter("mail.adminAddress");
26-
boolean sslEnabled = config.getParameter("mail.sslEnabled", true);
22+
String host = config.getParameter(ExtConfig.MAIL_SMTP_HOST);
23+
String port = config.getParameter(ExtConfig.MAIL_SMTP_PORT);
24+
String userName = config.getParameter(ExtConfig.MAIL_USERNAME);
25+
String password = config.getParameter(ExtConfig.MAIL_PASSWORD);
26+
String adminAddress = config.getParameter(ExtConfig.MAIL_ADMIN_ADDR);
27+
boolean sslEnabled = config.getParameter(ExtConfig.MAIL_SSL_ENABLED, true);
2728
return new SMTPMailManagerImpl(host, port, userName, password, adminAddress, sslEnabled);
2829
}
2930

‎lts-core/src/main/java/com/github/ltsopensource/biz/logger/JobLoggerFactory.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22

33
import com.github.ltsopensource.core.cluster.Config;
44
import com.github.ltsopensource.core.spi.SPI;
5-
import com.github.ltsopensource.core.spi.SpiExtensionKey;
5+
import com.github.ltsopensource.core.constant.ExtConfig;
66

77
/**
88
* @author Robert HG (254963746@qq.com) on 5/19/15.
99
*/
10-
@SPI(key = SpiExtensionKey.JOB_LOGGER, dftValue = "mysql")
10+
@SPI(key = ExtConfig.JOB_LOGGER, dftValue = "mysql")
1111
public interface JobLoggerFactory {
1212

1313
JobLogger getJobLogger(Config config);

‎lts-core/src/main/java/com/github/ltsopensource/biz/logger/LazyJobLogger.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import com.github.ltsopensource.core.cluster.Config;
88
import com.github.ltsopensource.core.commons.utils.CollectionUtils;
99
import com.github.ltsopensource.core.constant.Constants;
10+
import com.github.ltsopensource.core.constant.ExtConfig;
1011
import com.github.ltsopensource.core.factory.NamedThreadFactory;
1112
import com.github.ltsopensource.core.logger.Logger;
1213
import com.github.ltsopensource.core.logger.LoggerFactory;
@@ -42,10 +43,10 @@ public LazyJobLogger(AppContext appContext, JobLogger delegate) {
4243
this.delegate = delegate;
4344

4445
Config config = appContext.getConfig();
45-
maxMemoryLogSize = config.getParameter(Constants.LAZY_JOB_LOGGER_MEM_SIZE, 1000);
46-
int flushPeriod = config.getParameter(Constants.LAZY_JOB_LOGGER_CHECK_PERIOD, 3);
47-
batchFlushSize = config.getParameter(Constants.LAZY_JOB_LOGGER_BATCH_FLUSH_SIZE, 100);
48-
overflowSize = config.getParameter(Constants.LAZY_JOB_LOGGER_OVERFLOW_SIZE, 10000);
46+
maxMemoryLogSize = config.getParameter(ExtConfig.LAZY_JOB_LOGGER_MEM_SIZE, 1000);
47+
int flushPeriod = config.getParameter(ExtConfig.LAZY_JOB_LOGGER_CHECK_PERIOD, 3);
48+
batchFlushSize = config.getParameter(ExtConfig.LAZY_JOB_LOGGER_BATCH_FLUSH_SIZE, 100);
49+
overflowSize = config.getParameter(ExtConfig.LAZY_JOB_LOGGER_OVERFLOW_SIZE, 10000);
4950

5051
final ScheduledExecutorService executor = Executors.newSingleThreadScheduledExecutor(
5152
new NamedThreadFactory("LazyJobLogger", true));

‎lts-core/src/main/java/com/github/ltsopensource/biz/logger/SmartJobLogger.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import com.github.ltsopensource.biz.logger.domain.JobLoggerRequest;
66
import com.github.ltsopensource.core.AppContext;
77
import com.github.ltsopensource.core.cluster.Config;
8-
import com.github.ltsopensource.core.constant.Constants;
8+
import com.github.ltsopensource.core.constant.ExtConfig;
99
import com.github.ltsopensource.core.spi.ServiceLoader;
1010

1111
import java.util.List;
@@ -23,7 +23,7 @@ public SmartJobLogger(AppContext appContext) {
2323
Config config = appContext.getConfig();
2424
JobLoggerFactory jobLoggerFactory = ServiceLoader.load(JobLoggerFactory.class, config);
2525
JobLogger jobLogger = jobLoggerFactory.getJobLogger(config);
26-
if (config.getParameter(Constants.LAZY_JOB_LOGGER, false)) {
26+
if (config.getParameter(ExtConfig.LAZY_JOB_LOGGER, false)) {
2727
this.delegate = new LazyJobLogger(appContext, jobLogger);
2828
} else {
2929
this.delegate = jobLogger;

‎lts-core/src/main/java/com/github/ltsopensource/core/cluster/AbstractClientNode.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.github.ltsopensource.core.AppContext;
44
import com.github.ltsopensource.core.constant.Constants;
5+
import com.github.ltsopensource.core.constant.ExtConfig;
56
import com.github.ltsopensource.core.factory.NamedThreadFactory;
67
import com.github.ltsopensource.core.remoting.HeartBeatMonitor;
78
import com.github.ltsopensource.core.remoting.RemotingClientDelegate;
@@ -28,7 +29,7 @@ protected void remotingStart() {
2829

2930
RemotingProcessor defaultProcessor = getDefaultProcessor();
3031
if (defaultProcessor != null) {
31-
int processorSize = config.getParameter(Constants.PROCESSOR_THREAD, Constants.DEFAULT_PROCESSOR_THREAD);
32+
int processorSize = config.getParameter(ExtConfig.PROCESSOR_THREAD, Constants.DEFAULT_PROCESSOR_THREAD);
3233
remotingClient.registerDefaultProcessor(defaultProcessor,
3334
Executors.newFixedThreadPool(processorSize,
3435
new NamedThreadFactory(AbstractClientNode.class.getSimpleName(), true)));

‎lts-core/src/main/java/com/github/ltsopensource/core/cluster/AbstractJobNode.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
import com.github.ltsopensource.core.commons.utils.NetUtils;
1010
import com.github.ltsopensource.core.commons.utils.StringUtils;
1111
import com.github.ltsopensource.core.compiler.AbstractCompiler;
12-
import com.github.ltsopensource.core.constant.Constants;
1312
import com.github.ltsopensource.core.constant.EcTopic;
13+
import com.github.ltsopensource.core.constant.ExtConfig;
1414
import com.github.ltsopensource.core.factory.JobNodeConfigFactory;
1515
import com.github.ltsopensource.core.factory.NodeFactory;
1616
import com.github.ltsopensource.core.json.JSONFactory;
@@ -23,7 +23,7 @@
2323
import com.github.ltsopensource.core.protocol.command.CommandBodyWrapper;
2424
import com.github.ltsopensource.core.registry.*;
2525
import com.github.ltsopensource.core.spi.ServiceLoader;
26-
import com.github.ltsopensource.core.spi.SpiExtensionKey;
26+
import com.github.ltsopensource.core.constant.ExtConfig;
2727
import com.github.ltsopensource.core.support.AliveKeeping;
2828
import com.github.ltsopensource.ec.EventCenter;
2929
import com.github.ltsopensource.ec.EventInfo;
@@ -93,7 +93,7 @@ final public void start() {
9393

9494
private void initHttpCmdServer() {
9595
// 命令中心
96-
int port = appContext.getConfig().getParameter("lts.http.cmd.port", 8719);
96+
int port = appContext.getConfig().getParameter(ExtConfig.HTTP_CMD_PORT, 8719);
9797
appContext.setHttpCmdServer(HttpCmdServer.Factory.getHttpCmdServer(config.getIp(), port));
9898

9999
// 先启动，中间看端口是否被占用
@@ -143,7 +143,7 @@ public void destroy() {
143143

144144
protected void initConfig() {
145145

146-
String compiler = config.getParameter(Constants.COMPILER);
146+
String compiler = config.getParameter(ExtConfig.COMPILER);
147147
if (StringUtils.isNotEmpty(compiler)) {
148148
AbstractCompiler.setCompiler(compiler);
149149
}
@@ -177,19 +177,19 @@ protected void initConfig() {
177177

178178
private void setSpiConfig() {
179179
// 设置默认序列化方式
180-
String defaultSerializable = config.getParameter(SpiExtensionKey.REMOTING_SERIALIZABLE_DFT);
180+
String defaultSerializable = config.getParameter(ExtConfig.REMOTING_SERIALIZABLE_DFT);
181181
if (StringUtils.isNotEmpty(defaultSerializable)) {
182182
AdaptiveSerializable.setDefaultSerializable(defaultSerializable);
183183
}
184184

185185
// 设置json
186-
String ltsJson = config.getParameter(SpiExtensionKey.LTS_JSON);
186+
String ltsJson = config.getParameter(ExtConfig.LTS_JSON);
187187
if (StringUtils.isNotEmpty(ltsJson)) {
188188
JSONFactory.setJSONAdapter(ltsJson);
189189
}
190190

191191
// 设置logger
192-
String logger = config.getParameter(SpiExtensionKey.LTS_LOGGER);
192+
String logger = config.getParameter(ExtConfig.LTS_LOGGER);
193193
if (StringUtils.isNotEmpty(logger)) {
194194
LoggerFactory.setLoggerAdapter(logger);
195195
}

‎lts-core/src/main/java/com/github/ltsopensource/core/cluster/AbstractServerNode.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.github.ltsopensource.core.AppContext;
44
import com.github.ltsopensource.core.constant.Constants;
5+
import com.github.ltsopensource.core.constant.ExtConfig;
56
import com.github.ltsopensource.core.factory.NamedThreadFactory;
67
import com.github.ltsopensource.core.remoting.RemotingServerDelegate;
78
import com.github.ltsopensource.core.spi.ServiceLoader;
@@ -26,7 +27,7 @@ protected void remotingStart() {
2627

2728
RemotingProcessor defaultProcessor = getDefaultProcessor();
2829
if (defaultProcessor != null) {
29-
int processorSize = config.getParameter(Constants.PROCESSOR_THREAD, Constants.DEFAULT_PROCESSOR_THREAD);
30+
int processorSize = config.getParameter(ExtConfig.PROCESSOR_THREAD, Constants.DEFAULT_PROCESSOR_THREAD);
3031
remotingServer.registerDefaultProcessor(defaultProcessor,
3132
Executors.newFixedThreadPool(processorSize, new NamedThreadFactory(AbstractServerNode.class.getSimpleName(), true)));
3233
}

0 commit comments

Comments
 (0)