lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化PropertiesAgent

Browse Source
This commit is contained in:
Redkale
2022-11-29 20:14:11 +08:00
parent 595e2b83f5
commit 6ab8aa8e72
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/main/java/org/redkale/boot/Application.java
View File

@@ -773,7 +773,7 @@ public final class Application {
String key = prop.getValue("name"); String key = prop.getValue("name");
String value = prop.getValue("value"); String value = prop.getValue("value");
if (key == null || value == null) continue; if (key == null || value == null) continue;
putEnvironmentProperty(key, value, null); updateEnvironmentProperty(key, value, null);
} }
String dfloads = propertiesConf.getValue("load"); String dfloads = propertiesConf.getValue("load");
if (dfloads != null) { if (dfloads != null) {
@@ -788,7 +788,7 @@ public final class Application {
in.close(); in.close();
if (logger.isLoggable(Level.FINEST)) logger.log(Level.FINEST, "load properties(" + dfload + ") size = " + ps.size()); if (logger.isLoggable(Level.FINEST)) logger.log(Level.FINEST, "load properties(" + dfload + ") size = " + ps.size());
ps.forEach((x, y) -> { //load中的配置项除了redkale.cachesource.和redkale.datasource.开头，不应该有其他redkale.开头配置项 ps.forEach((x, y) -> { //load中的配置项除了redkale.cachesource.和redkale.datasource.开头，不应该有其他redkale.开头配置项
putEnvironmentProperty(x.toString(), y, null); updateEnvironmentProperty(x.toString(), y, null);
}); });
} catch (Exception e) { } catch (Exception e) {
logger.log(Level.WARNING, "load properties(" + dfload + ") error", e); logger.log(Level.WARNING, "load properties(" + dfload + ") error", e);
@@ -1703,10 +1703,10 @@ public final class Application {
return value == null ? value : value.replace("${APP_HOME}", homePath).replace("${APP_NAME}", name); return value == null ? value : value.replace("${APP_HOME}", homePath).replace("${APP_NAME}", name);
} }
//初始化加载时：notifyCache=null //初始化加载时：changeCache=null
//配置项动态变更时 notifyCache!=null, 由调用方统一执行ResourceFactory.register(notifyCache) //配置项动态变更时 changeCache!=null, 由调用方统一执行ResourceFactory.register(notifyCache)
//key只会是system.property.、mimetype.property.、redkale.cachesource(.|[)、redkale.datasource(.|[)和其他非redkale.开头的配置项 //key只会是system.property.、mimetype.property.、redkale.cachesource(.|[)、redkale.datasource(.|[)和其他非redkale.开头的配置项
void putEnvironmentProperty(String key, Object value, Properties notifyCache) { void updateEnvironmentProperty(String key, Object value, Properties changeCache) {
if (key == null || value == null) return; if (key == null || value == null) return;
String val = replaceValue(value.toString()); String val = replaceValue(value.toString());
if (key.startsWith("redkale.datasource.") || key.startsWith("redkale.datasource[") if (key.startsWith("redkale.datasource.") || key.startsWith("redkale.datasource[")
@@ -1714,26 +1714,26 @@ public final class Application {
sourceProperties.put(key, val); sourceProperties.put(key, val);
} else if (key.startsWith("system.property.")) { } else if (key.startsWith("system.property.")) {
String propName = key.substring("system.property.".length()); String propName = key.substring("system.property.".length());
if (notifyCache != null || System.getProperty(propName) == null) { //命令行传参数优先级高 if (changeCache != null || System.getProperty(propName) == null) { //命令行传参数优先级高
System.setProperty(propName, val); System.setProperty(propName, val);
} }
} else if (key.startsWith("mimetype.property.")) { } else if (key.startsWith("mimetype.property.")) {
MimeType.add(key.substring("mimetype.property.".length()), val); MimeType.add(key.substring("mimetype.property.".length()), val);
} else if (key.startsWith("property.")) { } else if (key.startsWith("property.")) {
if (notifyCache == null) { if (changeCache == null) {
resourceFactory.register(key, val); resourceFactory.register(key, val);
} else { } else {
notifyCache.put(key, val); changeCache.put(key, val);
} }
} else { } else {
if (key.startsWith("redkale.")) { if (key.startsWith("redkale.")) {
throw new RuntimeException("property " + key + " cannot redkale. startsWith"); throw new RuntimeException("property " + key + " cannot redkale. startsWith");
} }
envProperties.put(key, val); envProperties.put(key, val);
if (notifyCache == null) { if (changeCache == null) {
resourceFactory.register("property." + key, val); resourceFactory.register("property." + key, val);
} else { } else {
notifyCache.put("property." + key, val); changeCache.put("property." + key, val);
} }
} }
} }

6
src/main/java/org/redkale/boot/PropertiesAgent.java
View File

@@ -52,14 +52,14 @@ public abstract class PropertiesAgent {
*/ */
public abstract void destroy(AnyValue conf); public abstract void destroy(AnyValue conf);
protected void putEnvironmentProperties(Application application, Properties props) { protected void updateEnvironmentProperties(Application application, Properties props) {
Properties notifyCache = new Properties(); Properties notifyCache = new Properties();
props.forEach((k, v) -> application.putEnvironmentProperty(k.toString(), v, notifyCache)); props.forEach((k, v) -> application.updateEnvironmentProperty(k.toString(), v, notifyCache));
application.resourceFactory.register(notifyCache); application.resourceFactory.register(notifyCache);
} }
protected void putEnvironmentProperty(Application application, String key, Object value) { protected void putEnvironmentProperty(Application application, String key, Object value) {
application.putEnvironmentProperty(key, value, null); application.updateEnvironmentProperty(key, value, null);
} }
protected void reconfigLogging(Application application, Properties loggingProperties) { protected void reconfigLogging(Application application, Properties loggingProperties) {