Unverified Commit e99b5ac6 authored by lgcareer's avatar lgcareer Committed by GitHub
Browse files

Merge pull request #571 from lgcareer/branch-1.0.2 

fix bug 569 to resolve schedule doesn't really stop
parents d3e59773 233ec756

escheduler-api/src/main/java/cn/escheduler/api/service/ProcessDefinitionService.java

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ public class ProcessDefinitionService extends BaseDAGService { 
                    // set status

                    schedule.setReleaseState(ReleaseState.OFFLINE);

                    scheduleMapper.update(schedule);

                    deleteSchedule(project.getId(), id);

                    deleteSchedule(project.getId(), schedule.getId());

                }

                break;

            }

escheduler-api/src/main/java/cn/escheduler/api/service/SchedulerService.java

+4 −4
Original line number Diff line number Diff line
@@ -442,14 +442,14 @@ public class SchedulerService extends BaseService { 
    /**

     * delete schedule

     */

    public static void deleteSchedule(int projectId, int processId) throws RuntimeException{

        logger.info("delete schedules of project id:{}, flow id:{}", projectId, processId);

    public static void deleteSchedule(int projectId, int scheduleId) throws RuntimeException{

        logger.info("delete schedules of project id:{}, schedule id:{}", projectId, scheduleId);



        String jobName = QuartzExecutors.buildJobName(processId);

        String jobName = QuartzExecutors.buildJobName(scheduleId);

        String jobGroupName = QuartzExecutors.buildJobGroupName(projectId);



        if(!QuartzExecutors.getInstance().deleteJob(jobName, jobGroupName)){

            logger.warn("set offline failure:projectId:{},processId:{}",projectId,processId);

            logger.warn("set offline failure:projectId:{},scheduleId:{}",projectId,scheduleId);

            throw new RuntimeException(String.format("set offline failure"));

        }