diff options
| author | wangkuan <[email protected]> | 2023-12-21 11:29:08 +0800 |
|---|---|---|
| committer | wangkuan <[email protected]> | 2023-12-21 11:29:08 +0800 |
| commit | 24e4df2fb59645879be600eb4ca99656c577f2c9 (patch) | |
| tree | b94422e26c36635208c6b20b231ceda9aa0275a1 | |
| parent | 694dca052d291f01a122154fdc2c356e4a8fcf54 (diff) | |
[Feature][bootstrap] 通过system properties 获取config目录拓展的udf配置文件，待优化写入启动脚本start.sh
| -rw-r--r-- | groot-bootstrap/src/main/java/com/geedgenetworks/bootstrap/command/ExecuteCommand.java | 4 | ||||
| -rw-r--r-- | groot-common/src/main/java/com/geedgenetworks/common/config/ConfigProvider.java | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/groot-bootstrap/src/main/java/com/geedgenetworks/bootstrap/command/ExecuteCommand.java b/groot-bootstrap/src/main/java/com/geedgenetworks/bootstrap/command/ExecuteCommand.java index fbdf46f..e1f11d5 100644 --- a/groot-bootstrap/src/main/java/com/geedgenetworks/bootstrap/command/ExecuteCommand.java +++ b/groot-bootstrap/src/main/java/com/geedgenetworks/bootstrap/command/ExecuteCommand.java @@ -22,6 +22,8 @@ import java.util.Map; import java.util.Properties; import static com.geedgenetworks.bootstrap.utils.ConfigFileUtils.checkConfigExist; +import static com.geedgenetworks.common.Constants.MAPPING_GROOTSTREAM_UDF; +import static com.geedgenetworks.common.Constants.MAPPING_GROOTSTREAM_UDF_DEFAULT_PLUGIN; import static com.hazelcast.internal.config.DeclarativeConfigUtil.SYSPROP_MEMBER_CONFIG; @Slf4j @@ -38,6 +40,8 @@ public class ExecuteCommand implements Command<ExecuteCommandArgs> { Properties properties = System.getProperties(); properties.setProperty(Constants.SYSPROP_GROOTSTREAM_CONFIG, "config" + File.separator + Constants.HAZELCAST_GROOTSTREAM_DEFAULT_YAML); properties.setProperty(SYSPROP_MEMBER_CONFIG, "config" + File.separator + "hazelcast.yaml"); + properties.setProperty(MAPPING_GROOTSTREAM_UDF, "config" + File.separator + MAPPING_GROOTSTREAM_UDF_DEFAULT_PLUGIN); + GrootStreamConfig grootStreamConfig = ConfigProvider.locateAndGetGrootStreamConfig(); Path configFile = ConfigFileUtils.getConfigPath(executeCommandArgs); diff --git a/groot-common/src/main/java/com/geedgenetworks/common/config/ConfigProvider.java b/groot-common/src/main/java/com/geedgenetworks/common/config/ConfigProvider.java index 9ec2aae..497ff16 100644 --- a/groot-common/src/main/java/com/geedgenetworks/common/config/ConfigProvider.java +++ b/groot-common/src/main/java/com/geedgenetworks/common/config/ConfigProvider.java @@ -120,7 +120,6 @@ public class ConfigProvider { } public static List<String> locateAndGetMappingConfig(Properties properties) { - //validateSuffixInSystemProperty(SYSPROP_MEMBER_CONFIG); List<String> config; |