|
@@ -26,7 +26,6 @@ import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContextCacheMana
|
|
|
import org.apache.dolphinscheduler.plugin.task.api.TaskPluginManager;
|
|
|
import org.apache.dolphinscheduler.plugin.task.api.utils.LogUtils;
|
|
|
import org.apache.dolphinscheduler.plugin.task.api.utils.ProcessUtils;
|
|
|
-import org.apache.dolphinscheduler.server.worker.config.WorkerConfig;
|
|
|
import org.apache.dolphinscheduler.server.worker.message.MessageRetryRunner;
|
|
|
import org.apache.dolphinscheduler.server.worker.registry.WorkerRegistryClient;
|
|
|
import org.apache.dolphinscheduler.server.worker.rpc.WorkerRpcServer;
|
|
@@ -44,6 +43,7 @@ import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.boot.SpringApplication;
|
|
|
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
|
|
+import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
|
|
|
import org.springframework.context.annotation.ComponentScan;
|
|
|
import org.springframework.context.annotation.FilterType;
|
|
|
import org.springframework.transaction.annotation.EnableTransactionManagement;
|
|
@@ -51,10 +51,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
|
|
|
@SpringBootApplication
|
|
|
@EnableTransactionManagement
|
|
|
@ComponentScan(basePackages = "org.apache.dolphinscheduler", excludeFilters = {
|
|
|
- @ComponentScan.Filter(type = FilterType.REGEX, pattern = {
|
|
|
- "org.apache.dolphinscheduler.service.process.*",
|
|
|
- "org.apache.dolphinscheduler.service.queue.*",
|
|
|
- })
|
|
|
+ @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, value = DataSourceAutoConfiguration.class)
|
|
|
})
|
|
|
@Slf4j
|
|
|
public class WorkerServer implements IStoppable {
|
|
@@ -74,9 +71,6 @@ public class WorkerServer implements IStoppable {
|
|
|
@Autowired
|
|
|
private MessageRetryRunner messageRetryRunner;
|
|
|
|
|
|
- @Autowired
|
|
|
- private WorkerConfig workerConfig;
|
|
|
-
|
|
|
@Autowired
|
|
|
private GlobalTaskInstanceDispatchQueueLooper globalTaskInstanceDispatchQueueLooper;
|
|
|
|