修复统计信息显示异常

iwannay · Nov 28, 2020 · a590dbe · a590dbe
1 parent 4f31e00
commit a590dbe
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/jiacrontab_admin/srv.go b/jiacrontab_admin/srv.go
@@ -32,16 +32,21 @@ func (s *Srv) Register(args map[uint]models.Node, reply *bool) error {
 			"daemon_task_num":       node.DaemonTaskNum,
 			"crontab_task_num":      node.CrontabTaskNum,
 			"crontab_job_audit_num": node.CrontabJobAuditNum,
-			"daemon_job_audit_Num":  node.DaemonJobAuditNum,
+			"daemon_job_audit_num":  node.DaemonJobAuditNum,
 			"crontab_job_fail_num":  node.CrontabJobFailNum,
 		})
-
+		if ret.Error != nil {
+			return ret.Error
+		}
 		if node.GroupID == models.SuperGroup.ID {
-			models.DB().Unscoped().Model(&models.Node{}).Where("addr=?", node.Addr).Updates(map[string]interface{}{
+			ret = models.DB().Unscoped().Model(&models.Node{}).Where("addr=?", node.Addr).Updates(map[string]interface{}{
 				"name":       node.Name,
 				"deleted_at": nil,
 				"disabled":   false,
 			})
+			if ret.Error != nil {
+				return ret.Error
+			}
 		}
 
 		if ret.RowsAffected == 0 && node.GroupID == models.SuperGroup.ID {

diff --git a/jiacrontabd/jiacrontabd.go b/jiacrontabd/jiacrontabd.go
@@ -372,7 +372,7 @@ func (j *Jiacrontabd) heartBeat() {
 			}
 		}
 
-		if job.Failed && job.Status == models.StatusJobTiming || job.Status == models.StatusJobRunning {
+		if job.Failed && (job.Status == models.StatusJobTiming || job.Status == models.StatusJobRunning) {
 			node.CrontabJobFailNum += job.Total
 			superGroupNode.CrontabJobFailNum += job.Total
 		}