|
|
|
@ -1,7 +1,8 @@
|
|
|
|
package com.xxl.job.admin.business.scheduler.thread;
|
|
|
|
package com.xxl.job.admin.business.scheduler.thread;
|
|
|
|
|
|
|
|
|
|
|
|
import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
|
|
|
|
|
|
|
|
import com.xxl.job.admin.business.model.XxlJobLogReport;
|
|
|
|
import com.xxl.job.admin.business.model.XxlJobLogReport;
|
|
|
|
|
|
|
|
import com.xxl.job.admin.business.scheduler.config.XxlJobAdminBootstrap;
|
|
|
|
|
|
|
|
import com.xxl.tool.concurrent.CyclicThread;
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
|
|
|
|
|
|
|
|
@ -9,7 +10,7 @@ import java.util.Calendar;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.Date;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.List;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.Map;
|
|
|
|
import java.util.concurrent.TimeUnit;
|
|
|
|
import java.util.concurrent.atomic.AtomicLong;
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* job log report helper
|
|
|
|
* job log report helper
|
|
|
|
@ -19,144 +20,109 @@ import java.util.concurrent.TimeUnit;
|
|
|
|
public class JobLogReportHelper {
|
|
|
|
public class JobLogReportHelper {
|
|
|
|
private static final Logger logger = LoggerFactory.getLogger(JobLogReportHelper.class);
|
|
|
|
private static final Logger logger = LoggerFactory.getLogger(JobLogReportHelper.class);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private CyclicThread logReportThread;
|
|
|
|
private Thread logReportThread;
|
|
|
|
private AtomicLong lastCleanLogTime;
|
|
|
|
private volatile boolean toStop = false;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* start
|
|
|
|
* start
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public void start(){
|
|
|
|
public void start(){
|
|
|
|
logReportThread = new Thread(new Runnable() {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
* last clean log time （ Thread-safe concurrent reading and writing ）
|
|
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
lastCleanLogTime = new AtomicLong(0);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// log report thread
|
|
|
|
|
|
|
|
logReportThread = new CyclicThread("JobLogReportHelper#logReportThread", true, new Runnable() {
|
|
|
|
@Override
|
|
|
|
@Override
|
|
|
|
public void run() {
|
|
|
|
public void run() {
|
|
|
|
|
|
|
|
|
|
|
|
// last clean log time
|
|
|
|
// 1、log-report refresh: refresh log report in 3 days
|
|
|
|
long lastCleanLogTime = 0;
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// today
|
|
|
|
while (!toStop) {
|
|
|
|
Calendar itemDay = Calendar.getInstance();
|
|
|
|
|
|
|
|
itemDay.add(Calendar.DAY_OF_MONTH, -i);
|
|
|
|
// 1、log-report refresh: refresh log report in 3 days
|
|
|
|
itemDay.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
|
try {
|
|
|
|
itemDay.set(Calendar.MINUTE, 0);
|
|
|
|
|
|
|
|
itemDay.set(Calendar.SECOND, 0);
|
|
|
|
for (int i = 0; i < 3; i++) {
|
|
|
|
itemDay.set(Calendar.MILLISECOND, 0);
|
|
|
|
|
|
|
|
|
|
|
|
// today
|
|
|
|
Date todayFrom = itemDay.getTime();
|
|
|
|
Calendar itemDay = Calendar.getInstance();
|
|
|
|
|
|
|
|
itemDay.add(Calendar.DAY_OF_MONTH, -i);
|
|
|
|
itemDay.set(Calendar.HOUR_OF_DAY, 23);
|
|
|
|
itemDay.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
|
itemDay.set(Calendar.MINUTE, 59);
|
|
|
|
itemDay.set(Calendar.MINUTE, 0);
|
|
|
|
itemDay.set(Calendar.SECOND, 59);
|
|
|
|
itemDay.set(Calendar.SECOND, 0);
|
|
|
|
itemDay.set(Calendar.MILLISECOND, 999);
|
|
|
|
itemDay.set(Calendar.MILLISECOND, 0);
|
|
|
|
|
|
|
|
|
|
|
|
Date todayTo = itemDay.getTime();
|
|
|
|
Date todayFrom = itemDay.getTime();
|
|
|
|
|
|
|
|
|
|
|
|
// refresh log-report every minute
|
|
|
|
itemDay.set(Calendar.HOUR_OF_DAY, 23);
|
|
|
|
XxlJobLogReport xxlJobLogReport = new XxlJobLogReport();
|
|
|
|
itemDay.set(Calendar.MINUTE, 59);
|
|
|
|
xxlJobLogReport.setTriggerDay(todayFrom);
|
|
|
|
itemDay.set(Calendar.SECOND, 59);
|
|
|
|
xxlJobLogReport.setRunningCount(0);
|
|
|
|
itemDay.set(Calendar.MILLISECOND, 999);
|
|
|
|
xxlJobLogReport.setSucCount(0);
|
|
|
|
|
|
|
|
xxlJobLogReport.setFailCount(0);
|
|
|
|
Date todayTo = itemDay.getTime();
|
|
|
|
xxlJobLogReport.setUpdateTime(new Date());
|
|
|
|
|
|
|
|
|
|
|
|
// refresh log-report every minute
|
|
|
|
// fill count-data
|
|
|
|
XxlJobLogReport xxlJobLogReport = new XxlJobLogReport();
|
|
|
|
Map<String, Object> triggerCountMap = XxlJobAdminBootstrap.getInstance().getXxlJobLogMapper().findLogReport(todayFrom, todayTo);
|
|
|
|
xxlJobLogReport.setTriggerDay(todayFrom);
|
|
|
|
if (triggerCountMap!=null && !triggerCountMap.isEmpty()) {
|
|
|
|
xxlJobLogReport.setRunningCount(0);
|
|
|
|
int triggerDayCount = triggerCountMap.containsKey("triggerDayCount")?Integer.parseInt(String.valueOf(triggerCountMap.get("triggerDayCount"))):0;
|
|
|
|
xxlJobLogReport.setSucCount(0);
|
|
|
|
int triggerDayCountRunning = triggerCountMap.containsKey("triggerDayCountRunning")?Integer.parseInt(String.valueOf(triggerCountMap.get("triggerDayCountRunning"))):0;
|
|
|
|
xxlJobLogReport.setFailCount(0);
|
|
|
|
int triggerDayCountSuc = triggerCountMap.containsKey("triggerDayCountSuc")?Integer.parseInt(String.valueOf(triggerCountMap.get("triggerDayCountSuc"))):0;
|
|
|
|
xxlJobLogReport.setUpdateTime(new Date());
|
|
|
|
int triggerDayCountFail = triggerDayCount - triggerDayCountRunning - triggerDayCountSuc;
|
|
|
|
|
|
|
|
|
|
|
|
// fill count-data
|
|
|
|
xxlJobLogReport.setRunningCount(triggerDayCountRunning);
|
|
|
|
Map<String, Object> triggerCountMap = XxlJobAdminBootstrap.getInstance().getXxlJobLogMapper().findLogReport(todayFrom, todayTo);
|
|
|
|
xxlJobLogReport.setSucCount(triggerDayCountSuc);
|
|
|
|
if (triggerCountMap!=null && !triggerCountMap.isEmpty()) {
|
|
|
|
xxlJobLogReport.setFailCount(triggerDayCountFail);
|
|
|
|
int triggerDayCount = triggerCountMap.containsKey("triggerDayCount")?Integer.parseInt(String.valueOf(triggerCountMap.get("triggerDayCount"))):0;
|
|
|
|
|
|
|
|
int triggerDayCountRunning = triggerCountMap.containsKey("triggerDayCountRunning")?Integer.parseInt(String.valueOf(triggerCountMap.get("triggerDayCountRunning"))):0;
|
|
|
|
|
|
|
|
int triggerDayCountSuc = triggerCountMap.containsKey("triggerDayCountSuc")?Integer.parseInt(String.valueOf(triggerCountMap.get("triggerDayCountSuc"))):0;
|
|
|
|
|
|
|
|
int triggerDayCountFail = triggerDayCount - triggerDayCountRunning - triggerDayCountSuc;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
xxlJobLogReport.setRunningCount(triggerDayCountRunning);
|
|
|
|
|
|
|
|
xxlJobLogReport.setSucCount(triggerDayCountSuc);
|
|
|
|
|
|
|
|
xxlJobLogReport.setFailCount(triggerDayCountFail);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// do refresh:
|
|
|
|
|
|
|
|
XxlJobAdminBootstrap.getInstance().getXxlJobLogReportMapper().saveOrUpdate(xxlJobLogReport); // 0-fail; 1-save suc; 2-update suc;
|
|
|
|
|
|
|
|
/*if (ret < 1) {
|
|
|
|
|
|
|
|
XxlJobAdminBootstrap.getInstance().getXxlJobLogReportMapper().save(xxlJobLogReport);
|
|
|
|
|
|
|
|
}*/
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} catch (Throwable e) {
|
|
|
|
|
|
|
|
if (!toStop) {
|
|
|
|
|
|
|
|
logger.error(">>>>>>>>>>> xxl-job, JobLogReportHelper(log-report refresh) error:{}", e.getMessage(), e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
// 2、log-clean: switch open & once each day
|
|
|
|
// do refresh:
|
|
|
|
try {
|
|
|
|
XxlJobAdminBootstrap.getInstance().getXxlJobLogReportMapper().saveOrUpdate(xxlJobLogReport); // 0-fail; 1-save suc; 2-update suc;
|
|
|
|
if (XxlJobAdminBootstrap.getInstance().getLogretentiondays()>0
|
|
|
|
/*if (ret < 1) {
|
|
|
|
&& System.currentTimeMillis() - lastCleanLogTime > 24*60*60*1000) {
|
|
|
|
XxlJobAdminBootstrap.getInstance().getXxlJobLogReportMapper().save(xxlJobLogReport);
|
|
|
|
|
|
|
|
}*/
|
|
|
|
// expire-time
|
|
|
|
}
|
|
|
|
Calendar expiredDay = Calendar.getInstance();
|
|
|
|
|
|
|
|
expiredDay.add(Calendar.DAY_OF_MONTH, -1 * XxlJobAdminBootstrap.getInstance().getLogretentiondays());
|
|
|
|
|
|
|
|
expiredDay.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
|
|
|
|
|
expiredDay.set(Calendar.MINUTE, 0);
|
|
|
|
|
|
|
|
expiredDay.set(Calendar.SECOND, 0);
|
|
|
|
|
|
|
|
expiredDay.set(Calendar.MILLISECOND, 0);
|
|
|
|
|
|
|
|
Date clearBeforeTime = expiredDay.getTime();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// clean expired log
|
|
|
|
|
|
|
|
List<Long> logIds = null;
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
|
|
|
logIds = XxlJobAdminBootstrap.getInstance().getXxlJobLogMapper().findClearLogIds(0, 0, clearBeforeTime, 0, 1000);
|
|
|
|
|
|
|
|
if (logIds!=null && !logIds.isEmpty()) {
|
|
|
|
|
|
|
|
XxlJobAdminBootstrap.getInstance().getXxlJobLogMapper().clearLog(logIds);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} while (logIds!=null && !logIds.isEmpty());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// update clean time
|
|
|
|
|
|
|
|
lastCleanLogTime = System.currentTimeMillis();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
} catch (Throwable e) {
|
|
|
|
|
|
|
|
if (!toStop) {
|
|
|
|
|
|
|
|
logger.error(">>>>>>>>>>> xxl-job, JobLogReportHelper(log-clean) error:{}", e.getMessage(), e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try {
|
|
|
|
// 2、log-clean: switch open & once each day
|
|
|
|
TimeUnit.MINUTES.sleep(1);
|
|
|
|
if (XxlJobAdminBootstrap.getInstance().getLogretentiondays()>0
|
|
|
|
} catch (Throwable e) {
|
|
|
|
&& System.currentTimeMillis() - lastCleanLogTime.longValue() > 24*60*60*1000) {
|
|
|
|
if (!toStop) {
|
|
|
|
|
|
|
|
logger.error(e.getMessage(), e);
|
|
|
|
// expire-time
|
|
|
|
|
|
|
|
Calendar expiredDay = Calendar.getInstance();
|
|
|
|
|
|
|
|
expiredDay.add(Calendar.DAY_OF_MONTH, -1 * XxlJobAdminBootstrap.getInstance().getLogretentiondays());
|
|
|
|
|
|
|
|
expiredDay.set(Calendar.HOUR_OF_DAY, 0);
|
|
|
|
|
|
|
|
expiredDay.set(Calendar.MINUTE, 0);
|
|
|
|
|
|
|
|
expiredDay.set(Calendar.SECOND, 0);
|
|
|
|
|
|
|
|
expiredDay.set(Calendar.MILLISECOND, 0);
|
|
|
|
|
|
|
|
Date clearBeforeTime = expiredDay.getTime();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// clean expired log
|
|
|
|
|
|
|
|
List<Long> logIds = null;
|
|
|
|
|
|
|
|
do {
|
|
|
|
|
|
|
|
logIds = XxlJobAdminBootstrap.getInstance().getXxlJobLogMapper().findClearLogIds(0, 0, clearBeforeTime, 0, 1000);
|
|
|
|
|
|
|
|
if (logIds!=null && !logIds.isEmpty()) {
|
|
|
|
|
|
|
|
XxlJobAdminBootstrap.getInstance().getXxlJobLogMapper().clearLog(logIds);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
} while (logIds!=null && !logIds.isEmpty());
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// update clean time
|
|
|
|
|
|
|
|
lastCleanLogTime.set(System.currentTimeMillis());
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
logger.info(">>>>>>>>>>> xxl-job, job log report thread stop");
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}, 60 * 1000L, true);
|
|
|
|
logReportThread.setDaemon(true);
|
|
|
|
|
|
|
|
logReportThread.setName("xxl-job, admin JobLogReportHelper");
|
|
|
|
|
|
|
|
logReportThread.start();
|
|
|
|
logReportThread.start();
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
/**
|
|
|
|
* stop
|
|
|
|
* stop
|
|
|
|
*/
|
|
|
|
*/
|
|
|
|
public void stop(){
|
|
|
|
public void stop(){
|
|
|
|
toStop = true;
|
|
|
|
logReportThread.stop();
|
|
|
|
// interrupt and wait
|
|
|
|
|
|
|
|
logReportThread.interrupt();
|
|
|
|
|
|
|
|
try {
|
|
|
|
|
|
|
|
logReportThread.join();
|
|
|
|
|
|
|
|
} catch (Throwable e) {
|
|
|
|
|
|
|
|
logger.error(e.getMessage(), e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
xuxueli
3 months ago