update 格式化代码 统一间隔符

疯狂的狮子li

2022-01-13 a0bed51d966ab5d161d3fdd5423ba84f59fb60ff

 ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java

@@ -17,65 +17,67 @@
 * @author xuxueli 2015-9-1 18:05:56
 */
public class JobFailMonitorHelper {
   private static Logger logger = LoggerFactory.getLogger(JobFailMonitorHelper.class);
	
   private static JobFailMonitorHelper instance = new JobFailMonitorHelper();
   public static JobFailMonitorHelper getInstance(){
      return instance;
   }
    private static Logger logger = LoggerFactory.getLogger(JobFailMonitorHelper.class);

   // ---------------------- monitor ----------------------
    private static JobFailMonitorHelper instance = new JobFailMonitorHelper();

   private Thread monitorThread;
   private volatile boolean toStop = false;
   public void start(){
      monitorThread = new Thread(new Runnable() {
    public static JobFailMonitorHelper getInstance() {
        return instance;
    }

         @Override
         public void run() {
    // ---------------------- monitor ----------------------

            // monitor
            while (!toStop) {
               try {
    private Thread monitorThread;
    private volatile boolean toStop = false;

                  List<Long> failLogIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findFailJobLogIds(1000);
                  if (failLogIds!=null && !failLogIds.isEmpty()) {
                     for (long failLogId: failLogIds) {
    public void start() {
        monitorThread = new Thread(new Runnable() {

                        // lock log
                        int lockRet = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus(failLogId, 0, -1);
                        if (lockRet < 1) {
                           continue;
                        }
                        XxlJobLog log = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().load(failLogId);
                        XxlJobInfo info = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().loadById(log.getJobId());
            @Override
            public void run() {

                        // 1、fail retry monitor
                        if (log.getExecutorFailRetryCount() > 0) {
                           JobTriggerPoolHelper.trigger(log.getJobId(), TriggerTypeEnum.RETRY, (log.getExecutorFailRetryCount()-1), log.getExecutorShardingParam(), log.getExecutorParam(), null);
                           String retryMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>"+ I18nUtil.getString("jobconf_trigger_type_retry") +"<<<<<<<<<<< </span><br>";
                           log.setTriggerMsg(log.getTriggerMsg() + retryMsg);
                           XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateTriggerInfo(log);
                        }
                // monitor
                while (!toStop) {
                    try {

                        // 2、fail alarm monitor
                        int newAlarmStatus = 0;      // 告警状态：0-默认、-1=锁定状态、1-无需告警、2-告警成功、3-告警失败
                        if (info!=null && info.getAlarmEmail()!=null && info.getAlarmEmail().trim().length()>0) {
                           boolean alarmResult = XxlJobAdminConfig.getAdminConfig().getJobAlarmer().alarm(info, log);
                           newAlarmStatus = alarmResult?2:3;
                        } else {
                           newAlarmStatus = 1;
                        }
                        List<Long> failLogIds = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().findFailJobLogIds(1000);
                        if (failLogIds != null && !failLogIds.isEmpty()) {
                            for (long failLogId : failLogIds) {

                        XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus(failLogId, -1, newAlarmStatus);
                     }
                  }
                                // lock log
                                int lockRet = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus(failLogId, 0, -1);
                                if (lockRet < 1) {
                                    continue;
                                }
                                XxlJobLog log = XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().load(failLogId);
                                XxlJobInfo info = XxlJobAdminConfig.getAdminConfig().getXxlJobInfoDao().loadById(log.getJobId());

               } catch (Exception e) {
                  if (!toStop) {
                     logger.error(">>>>>>>>>>> xxl-job, job fail monitor thread error:{}", e);
                  }
               }
                                // 1、fail retry monitor
                                if (log.getExecutorFailRetryCount() > 0) {
                                    JobTriggerPoolHelper.trigger(log.getJobId(), TriggerTypeEnum.RETRY, (log.getExecutorFailRetryCount() - 1), log.getExecutorShardingParam(), log.getExecutorParam(), null);
                                    String retryMsg = "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>" + I18nUtil.getString("jobconf_trigger_type_retry") + "<<<<<<<<<<< </span><br>";
                                    log.setTriggerMsg(log.getTriggerMsg() + retryMsg);
                                    XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateTriggerInfo(log);
                                }

                                // 2、fail alarm monitor
                                int newAlarmStatus = 0;        // 告警状态：0-默认、-1=锁定状态、1-无需告警、2-告警成功、3-告警失败
                                if (info != null && info.getAlarmEmail() != null && info.getAlarmEmail().trim().length() > 0) {
                                    boolean alarmResult = XxlJobAdminConfig.getAdminConfig().getJobAlarmer().alarm(info, log);
                                    newAlarmStatus = alarmResult ? 2 : 3;
                                } else {
                                    newAlarmStatus = 1;
                                }

                                XxlJobAdminConfig.getAdminConfig().getXxlJobLogDao().updateAlarmStatus(failLogId, -1, newAlarmStatus);
                            }
                        }

                    } catch (Exception e) {
                        if (!toStop) {
                            logger.error(">>>>>>>>>>> xxl-job, job fail monitor thread error:{}" , e);
                        }
                    }

                    try {
                        TimeUnit.SECONDS.sleep(10);
@@ -87,24 +89,24 @@

                }

            logger.info(">>>>>>>>>>> xxl-job, job fail monitor thread stop");
                logger.info(">>>>>>>>>>> xxl-job, job fail monitor thread stop");

         }
      });
      monitorThread.setDaemon(true);
      monitorThread.setName("xxl-job, admin JobFailMonitorHelper");
      monitorThread.start();
   }
            }
        });
        monitorThread.setDaemon(true);
        monitorThread.setName("xxl-job, admin JobFailMonitorHelper");
        monitorThread.start();
    }

   public void toStop(){
      toStop = true;
      // interrupt and wait
      monitorThread.interrupt();
      try {
         monitorThread.join();
      } catch (InterruptedException e) {
         logger.error(e.getMessage(), e);
      }
   }
    public void toStop() {
        toStop = true;
        // interrupt and wait
        monitorThread.interrupt();
        try {
            monitorThread.join();
        } catch (InterruptedException e) {
            logger.error(e.getMessage(), e);
        }
    }

}