Fixed ProducerManager handle disable job issue.

apache · Jun 28, 2017 · a3db760 · a3db760
1 parent dc3d7f3
commit a3db760
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/...uler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/ProducerManager.java b/...uler/src/main/java/com/dangdang/ddframe/job/cloud/scheduler/producer/ProducerManager.java
@@ -22,6 +22,7 @@
 import com.dangdang.ddframe.job.cloud.scheduler.config.job.CloudJobConfiguration;
 import com.dangdang.ddframe.job.cloud.scheduler.config.job.CloudJobConfigurationService;
 import com.dangdang.ddframe.job.cloud.scheduler.config.job.CloudJobExecutionType;
+import com.dangdang.ddframe.job.cloud.scheduler.state.disable.app.DisableAppService;
 import com.dangdang.ddframe.job.cloud.scheduler.state.disable.job.DisableJobService;
 import com.dangdang.ddframe.job.cloud.scheduler.state.ready.ReadyService;
 import com.dangdang.ddframe.job.cloud.scheduler.state.running.RunningService;
@@ -54,6 +55,8 @@ public final class ProducerManager {
 
     private final RunningService runningService;
 
+    private final DisableAppService disableAppService;
+
     private final DisableJobService disableJobService;
 
     private final TransientProducerScheduler transientProducerScheduler;
@@ -66,6 +69,7 @@ public ProducerManager(final SchedulerDriver schedulerDriver, final CoordinatorR
         configService = new CloudJobConfigurationService(regCenter);
         readyService = new ReadyService(regCenter);
         runningService = new RunningService(regCenter);
+        disableAppService = new DisableAppService(regCenter);
         disableJobService = new DisableJobService(regCenter);
         transientProducerScheduler = new TransientProducerScheduler(readyService);
     }
@@ -137,7 +141,7 @@ public void deregister(final String jobName) {
      * @param jobConfig 作业配置
      */
     public void schedule(final CloudJobConfiguration jobConfig) {
-        if (disableJobService.isDisabled(jobConfig.getAppName())) {
+        if (disableAppService.isDisabled(jobConfig.getAppName()) || disableJobService.isDisabled(jobConfig.getJobName())) {
             return;
         }
         if (CloudJobExecutionType.TRANSIENT == jobConfig.getJobExecutionType()) {