diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/AdapterExecutorProperties.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/AdapterExecutorProperties.java index 9328b6de..9f4ea25e 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/AdapterExecutorProperties.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/AdapterExecutorProperties.java @@ -44,4 +44,9 @@ public class AdapterExecutorProperties { * Maximum pool size */ private Integer maximumPoolSize; + + /** + * nodes + */ + private String nodes; } diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/ExecutorProperties.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/ExecutorProperties.java index 735a0d13..b4470a81 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/ExecutorProperties.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/ExecutorProperties.java @@ -102,4 +102,9 @@ public class ExecutorProperties { * Notify */ private DynamicThreadPoolNotifyProperties notify; + + /** + * nodes + */ + private String nodes; } diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/WebThreadPoolProperties.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/WebThreadPoolProperties.java index 915a0c4d..1603a828 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/WebThreadPoolProperties.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/config/WebThreadPoolProperties.java @@ -39,4 +39,9 @@ public class WebThreadPoolProperties { * Keep alive time */ private Integer keepAliveTime; + + /** + * nodes + */ + private String nodes; } diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/AbstractRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/AbstractRefreshListener.java new file mode 100644 index 00000000..e67ad34e --- /dev/null +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/AbstractRefreshListener.java @@ -0,0 +1,114 @@ +package cn.hippo4j.core.springboot.starter.refresher.event; + +import cn.hippo4j.common.config.ApplicationContextHolder; +import cn.hippo4j.common.toolkit.Assert; +import cn.hippo4j.common.toolkit.StringUtil; +import cn.hippo4j.core.toolkit.inet.InetUtils; +import lombok.Data; +import lombok.extern.log4j.Log4j2; +import org.springframework.core.env.Environment; + +import java.util.Arrays; +import java.util.Objects; + +/** + * Refresh listener abstract base class. + */ +@Log4j2 +public abstract class AbstractRefreshListener implements RefreshListener { + + protected static final String PORT_PROPERTY = "local.server.port"; + + protected static final String ALL = "*"; + + /** + * separator + */ + protected static final String SEPARATOR = ","; + + /** + * application ip + */ + protected final String ipAddress; + + /** + * application post + */ + protected final String port; + + AbstractRefreshListener() { + InetUtils inetUtils = ApplicationContextHolder.getBean(InetUtils.class); + InetUtils.HostInfo loopbackHostInfo = inetUtils.findFirstNonLoopbackHostInfo(); + Assert.isNull(loopbackHostInfo, "Unable to get the application IP address"); + ipAddress = loopbackHostInfo.getIpAddress(); + Environment environment = ApplicationContextHolder.getInstance().getEnvironment(); + Assert.isTrue(environment.containsProperty(PORT_PROPERTY), "Unable to get the application port"); + port = environment.getProperty(PORT_PROPERTY); + } + + /** + * Matching nodes
+ * nodes is ip + port.Get 'nodes' in the new Properties,Compare this with the ip + port of Application.
+ * Support prefix pattern matching.e.g:
+ * + * The format of ip + port is ip : port. + * + * @param properties new Properties + */ + @Override + public boolean match(M properties) { + return false; + } + + /** + * check all + * + * @param nodes nodes + */ + protected boolean checkArray(String nodes) { + if (StringUtil.isEmpty(nodes) || ALL.equals(nodes)) { + return true; + } + String[] splitNodes = nodes.split(SEPARATOR); + return Arrays.stream(splitNodes) + .distinct() + .map(IpAndPort::new) + .map(i -> i.check(ipAddress, port)) + .anyMatch(Boolean.FALSE::equals); + } + + /** + * ip + port + */ + @Data + protected static class IpAndPort { + + protected static final String COLON = ";"; + private String ip; + private String port; + + public IpAndPort(String node) { + String[] ipPort = node.split(COLON); + Assert.isTrue(ipPort.length != 2, "The IP address format is error:" + node); + ip = ipPort[0]; + port = ipPort[1]; + } + + /** + * check + * + * @param ip application ip + * @param port application port + */ + public boolean check(String ip, String port) { + return Objects.equals(ip, this.ip) && Objects.equals(port, this.port); + } + + } + +} \ No newline at end of file diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/AdapterExecutorsRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/AdapterExecutorsRefreshListener.java index 0c30311c..ffba397b 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/AdapterExecutorsRefreshListener.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/AdapterExecutorsRefreshListener.java @@ -22,6 +22,7 @@ import cn.hippo4j.adapter.base.ThreadPoolAdapterParameter; import cn.hippo4j.common.config.ApplicationContextHolder; import cn.hippo4j.common.toolkit.CollectionUtil; import cn.hippo4j.core.springboot.starter.config.AdapterExecutorProperties; +import cn.hippo4j.core.springboot.starter.config.ExecutorProperties; import cn.hutool.core.bean.BeanUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationListener; @@ -40,7 +41,13 @@ import static cn.hippo4j.core.springboot.starter.support.DynamicThreadPoolAdapte */ @Slf4j @Order(ADAPTER_EXECUTORS_LISTENER) -public class AdapterExecutorsRefreshListener implements ApplicationListener { +public class AdapterExecutorsRefreshListener extends AbstractRefreshListener { + + @Override + public boolean match(AdapterExecutorProperties properties) { + String nodes = properties.getNodes(); + return checkArray(nodes); + } @Override public void onApplicationEvent(Hippo4jConfigDynamicRefreshEvent event) { @@ -52,11 +59,11 @@ public class AdapterExecutorsRefreshListener implements ApplicationListener { if (Objects.equals(val.mark(), each.getMark())) { val.updateThreadPool(BeanUtil.toBean(each, ThreadPoolAdapterParameter.class)); diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java index 6f5f0d1b..cb6e1a8f 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/DynamicThreadPoolRefreshListener.java @@ -21,6 +21,7 @@ import cn.hippo4j.common.executor.support.BlockingQueueTypeEnum; import cn.hippo4j.common.executor.support.RejectedPolicyTypeEnum; import cn.hippo4j.common.executor.support.ResizableCapacityLinkedBlockingQueue; import cn.hippo4j.common.toolkit.CollectionUtil; +import cn.hippo4j.common.toolkit.StringUtil; import cn.hippo4j.core.executor.DynamicThreadPoolExecutor; import cn.hippo4j.core.executor.ThreadPoolNotifyAlarmHandler; import cn.hippo4j.core.executor.manage.GlobalNotifyAlarmManage; @@ -29,6 +30,7 @@ import cn.hippo4j.core.executor.support.AbstractDynamicExecutorSupport; import cn.hippo4j.core.proxy.RejectedProxyUtil; import cn.hippo4j.core.springboot.starter.config.BootstrapConfigProperties; import cn.hippo4j.core.springboot.starter.config.ExecutorProperties; +import cn.hippo4j.core.springboot.starter.config.WebThreadPoolProperties; import cn.hippo4j.core.springboot.starter.notify.CoreNotifyConfigBuilder; import cn.hippo4j.core.springboot.starter.support.GlobalCoreThreadPoolManage; import cn.hippo4j.message.dto.NotifyConfigDTO; @@ -60,7 +62,7 @@ import static cn.hippo4j.core.springboot.starter.refresher.event.Hippo4jConfigDy @Slf4j @RequiredArgsConstructor @Order(EXECUTORS_LISTENER) -public class DynamicThreadPoolRefreshListener implements ApplicationListener { +public class DynamicThreadPoolRefreshListener extends AbstractRefreshListener { private final ThreadPoolNotifyAlarmHandler threadPoolNotifyAlarmHandler; @@ -68,19 +70,25 @@ public class DynamicThreadPoolRefreshListener implements ApplicationListener executors = bindableConfigProperties.getExecutors(); for (ExecutorProperties properties : executors) { String threadPoolId = properties.getThreadPoolId(); - /** + if (!match(properties) && !checkConsistency(threadPoolId, properties)) { + continue; + } + /* * Check whether the notification configuration is consistent, this operation will not trigger the notification. */ checkNotifyConsistencyAndReplace(properties); - if (!checkConsistency(threadPoolId, properties)) { - continue; - } dynamicRefreshPool(threadPoolId, properties); ExecutorProperties beforeProperties = GlobalCoreThreadPoolManage.getProperties(properties.getThreadPoolId()); GlobalCoreThreadPoolManage.refresh(threadPoolId, failDefaultExecutorProperties(beforeProperties, properties)); diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/PlatformsRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/PlatformsRefreshListener.java index c73ea1a0..957acd94 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/PlatformsRefreshListener.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/PlatformsRefreshListener.java @@ -37,7 +37,7 @@ import static cn.hippo4j.core.springboot.starter.refresher.event.Hippo4jConfigDy * Platforms refresh listener. */ @Order(PLATFORMS_LISTENER) -public class PlatformsRefreshListener implements ApplicationListener { +public class PlatformsRefreshListener extends AbstractRefreshListener { @Override public void onApplicationEvent(Hippo4jConfigDynamicRefreshEvent threadPoolDynamicRefreshEvent) { diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/RefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/RefreshListener.java new file mode 100644 index 00000000..8f68d639 --- /dev/null +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/RefreshListener.java @@ -0,0 +1,14 @@ +package cn.hippo4j.core.springboot.starter.refresher.event; + +import cn.hippo4j.common.function.Matcher; +import org.springframework.context.ApplicationEvent; +import org.springframework.context.ApplicationListener; + +/** + * Refresh listener interface. + * T：event. + * M：properties. + */ +public interface RefreshListener extends ApplicationListener, Matcher { + +} diff --git a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/WebExecutorRefreshListener.java b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/WebExecutorRefreshListener.java index 05bcbb1e..083ac58f 100644 --- a/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/WebExecutorRefreshListener.java +++ b/hippo4j-spring-boot/hippo4j-config-spring-boot-starter/src/main/java/cn/hippo4j/core/springboot/starter/refresher/event/WebExecutorRefreshListener.java @@ -22,10 +22,10 @@ import cn.hippo4j.adapter.web.WebThreadPoolService; import cn.hippo4j.common.config.ApplicationContextHolder; import cn.hippo4j.common.model.ThreadPoolParameter; import cn.hippo4j.common.model.ThreadPoolParameterInfo; +import cn.hippo4j.common.toolkit.StringUtil; import cn.hippo4j.core.springboot.starter.config.BootstrapConfigProperties; import cn.hippo4j.core.springboot.starter.config.WebThreadPoolProperties; import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationListener; import org.springframework.core.annotation.Order; import java.util.Objects; @@ -37,14 +37,20 @@ import static cn.hippo4j.core.springboot.starter.refresher.event.Hippo4jConfigDy */ @Slf4j @Order(WEB_EXECUTOR_LISTENER) -public class WebExecutorRefreshListener implements ApplicationListener { +public class WebExecutorRefreshListener extends AbstractRefreshListener { + + @Override + public boolean match(WebThreadPoolProperties properties) { + String nodes = properties.getNodes(); + return checkArray(nodes); + } @Override public void onApplicationEvent(Hippo4jConfigDynamicRefreshEvent threadPoolDynamicRefreshEvent) { BootstrapConfigProperties bindableCoreProperties = threadPoolDynamicRefreshEvent.getBootstrapConfigProperties(); boolean isNullFlag = bindableCoreProperties.getJetty() == null - && bindableCoreProperties.getUndertow() == null - && bindableCoreProperties.getTomcat() == null; + && bindableCoreProperties.getUndertow() == null + && bindableCoreProperties.getTomcat() == null; if (isNullFlag) { return; } @@ -75,12 +81,12 @@ public class WebExecutorRefreshListener implements ApplicationListener