Merge remote-tracking branch 'origin/develop' into develop

pull/1112/head
LiXuemin 3 years ago
commit 7537c7827d

@ -51,30 +51,6 @@ public class BootstrapConfigProperties implements BootstrapPropertiesInterface {
*/
private MonitorProperties monitor = new MonitorProperties();
/***
* Latest use {@link MonitorProperties#getEnable()}
*/
@Deprecated
private Boolean collect = Boolean.TRUE;
/**
* Latest use {@link MonitorProperties#getCollectTypes()}
*/
@Deprecated
private String collectType;
/**
* Latest use {@link MonitorProperties#getInitialDelay()}
*/
@Deprecated
private Long initialDelay = 10000L;
/**
* Latest use {@link MonitorProperties#getCollectInterval()}
*/
@Deprecated
private Long collectInterval = 5000L;
/**
* Config file type.
*/

@ -79,8 +79,8 @@ public class ThreadPoolMonitorExecutor implements ApplicationRunner, DisposableB
// Execute dynamic thread pool monitoring component.
collectScheduledExecutor.scheduleWithFixedDelay(
this::scheduleRunnable,
properties.getInitialDelay(),
properties.getCollectInterval(),
monitor.getInitialDelay(),
monitor.getCollectInterval(),
TimeUnit.MILLISECONDS);
if (GlobalThreadPoolManage.getThreadPoolNum() > 0) {
log.info("Dynamic thread pool: [{}]. The dynamic thread pool starts data collection and reporting.", getThreadPoolNum());

Loading…
Cancel
Save