diff --git a/bin/check-alert.sh b/bin/check-alert.sh index 056ea9c..b057670 100755 --- a/bin/check-alert.sh +++ b/bin/check-alert.sh @@ -100,7 +100,7 @@ else # 直接查 MySQL 最近 20min 新流程 + message_log,和 watchdog v5 逻辑统一 ALERT_WINDOW_MIN=20 NEW_REQS=$(MYSQL_PWD="${DB_PASS}" mysql -h39.100.72.102 -P3306 -uecology "${DB_NAME}" \ - -sN -e "SELECT COUNT(*) FROM workflow_requestbase WHERE CREATEDATE=CURDATE() AND CREATETIME >= DATE_FORMAT(NOW() - INTERVAL ${ALERT_WINDOW_MIN} MINUTE, '%H:%i:%s') AND DELETED=0;" 2>/dev/null) + -sN -e "SELECT COUNT(*) FROM ecology_message_info_read WHERE CREATEDATE=CURDATE() AND CREATETIME >= DATE_FORMAT(NOW() - INTERVAL ${ALERT_WINDOW_MIN} MINUTE, '%H:%i:%s') AND ID NOT LIKE 'DUMMY_%';" 2>/dev/null) MSG_20MIN=$(MYSQL_PWD="${DB_PASS}" mysql -h39.100.72.102 -P3306 -uecology "${DB_NAME}" \ -sN -e "SELECT COUNT(*) FROM ecology_message_log WHERE CREATEDATE=CURDATE() AND CREATETIME >= DATE_FORMAT(NOW() - INTERVAL ${ALERT_WINDOW_MIN} MINUTE, '%H:%i:%s');" 2>/dev/null) diff --git a/bin/resin-watchdog.sh b/bin/resin-watchdog.sh index 19b28e1..47ef64f 100755 --- a/bin/resin-watchdog.sh +++ b/bin/resin-watchdog.sh @@ -109,7 +109,7 @@ fi # 2a. 最近 WINDOW_MIN 分钟新流程数(有没有人提流程?) NEW_REQS=$(MYSQL_PWD="${DB_PASS}" mysql -h39.100.72.102 -P3306 -uecology "${DB_NAME}" \ - -sN -e "SELECT COUNT(*) FROM workflow_requestbase WHERE CREATEDATE=CURDATE() AND CREATETIME >= DATE_FORMAT(NOW() - INTERVAL ${WINDOW_MIN} MINUTE, '%H:%i:%s') AND DELETED=0;" 2>/dev/null) + -sN -e "SELECT COUNT(*) FROM ecology_message_info_read WHERE CREATEDATE=CURDATE() AND CREATETIME >= DATE_FORMAT(NOW() - INTERVAL ${WINDOW_MIN} MINUTE, '%H:%i:%s') AND ID NOT LIKE 'DUMMY_%';" 2>/dev/null) # 2b. 最近 WINDOW_MIN 分钟 message_log 入库(推送线程活着吗?) MSG_COUNT=$(MYSQL_PWD="${DB_PASS}" mysql -h39.100.72.102 -P3306 -uecology "${DB_NAME}" \ diff --git a/state/resin_pid.last b/state/resin_pid.last index 5af8c21..fea0674 100644 --- a/state/resin_pid.last +++ b/state/resin_pid.last @@ -1 +1 @@ -9155 32063 1794012902 +8798 207 1794013423