third_codes/PowerJob
1
0
Fork 1
mirror of https://github.com/PowerJob/PowerJob.git synced 2025-07-17 00:00:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: optimize PowerJobSpringWorker

Browse Source
This commit is contained in:
tjq 2023-02-01 22:13:52 +08:00
parent 95a1f43994
commit 39893b1e92
2 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
powerjob-worker-spring-boot-starter/src/main/java/tech/powerjob/worker/autoconfigure/PowerJobAutoConfiguration.java
View File

@ -8,7 +8,6 @@ import org.springframework.context.annotation.Configuration;
import tech.powerjob.common.utils.CommonUtils; import tech.powerjob.common.utils.CommonUtils;
import tech.powerjob.common.utils.NetUtils; import tech.powerjob.common.utils.NetUtils;
import tech.powerjob.worker.PowerJobSpringWorker; import tech.powerjob.worker.PowerJobSpringWorker;
import tech.powerjob.worker.PowerJobWorker;
import tech.powerjob.worker.common.PowerJobWorkerConfig; import tech.powerjob.worker.common.PowerJobWorkerConfig;
import java.util.Arrays; import java.util.Arrays;
@ -27,7 +26,7 @@ public class PowerJobAutoConfiguration {
@Bean @Bean
@ConditionalOnMissingBean @ConditionalOnMissingBean
public PowerJobWorker initPowerJob(PowerJobProperties properties) { public PowerJobSpringWorker initPowerJob(PowerJobProperties properties) {
PowerJobProperties.Worker worker = properties.getWorker(); PowerJobProperties.Worker worker = properties.getWorker();

22
powerjob-worker/src/main/java/tech/powerjob/worker/PowerJobSpringWorker.java
View File

@ -21,16 +21,22 @@ import java.util.Optional;
* @author tjq * @author tjq
* @since 2023/1/20 * @since 2023/1/20
*/ */
public class PowerJobSpringWorker extends PowerJobWorker implements ApplicationContextAware, InitializingBean, DisposableBean { public class PowerJobSpringWorker implements ApplicationContextAware, InitializingBean, DisposableBean {
/**
* 组合优于继承，持有 PowerJobWorker，内部重新设置 ProcessorFactory 更优雅
*/
private PowerJobWorker powerJobWorker;
private final PowerJobWorkerConfig config;
public PowerJobSpringWorker(PowerJobWorkerConfig config) { public PowerJobSpringWorker(PowerJobWorkerConfig config) {
super(config); this.config = config;
} }
@Override @Override
public void afterPropertiesSet() throws Exception { public void afterPropertiesSet() throws Exception {
init(); powerJobWorker = new PowerJobWorker(config);
powerJobWorker.init();
} }
@Override @Override
@ -38,12 +44,16 @@ public class PowerJobSpringWorker extends PowerJobWorker implements ApplicationC
BuiltInSpringProcessorFactory springProcessorFactory = new BuiltInSpringProcessorFactory(applicationContext); BuiltInSpringProcessorFactory springProcessorFactory = new BuiltInSpringProcessorFactory(applicationContext);
// append BuiltInSpringProcessorFactory // append BuiltInSpringProcessorFactory
PowerJobWorkerConfig workerConfig = workerRuntime.getWorkerConfig();
List<ProcessorFactory> processorFactories = Lists.newArrayList( List<ProcessorFactory> processorFactories = Lists.newArrayList(
Optional.ofNullable(workerConfig.getProcessorFactoryList()) Optional.ofNullable(config.getProcessorFactoryList())
.orElse(Collections.emptyList())); .orElse(Collections.emptyList()));
processorFactories.add(springProcessorFactory); processorFactories.add(springProcessorFactory);
workerConfig.setProcessorFactoryList(processorFactories); config.setProcessorFactoryList(processorFactories);
} }
@Override
public void destroy() throws Exception {
powerJobWorker.destroy();
}
} }