From 55fc516049bbfdea3cea2dbaf1b17956c40b61f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Sat, 13 Jan 2024 02:27:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E7=9B=91=E6=8E=A7):=20?= =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/console/commands/monitoring.go | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/app/console/commands/monitoring.go b/app/console/commands/monitoring.go index f5c6086a..57a73974 100644 --- a/app/console/commands/monitoring.go +++ b/app/console/commands/monitoring.go @@ -43,8 +43,8 @@ func (receiver *Monitoring) Handle(ctx console.Context) error { return nil } - var setting models.Setting - monitor := services.NewSettingImpl().Get(models.SettingKeyMonitor) + setting := services.NewSettingImpl() + monitor := setting.Get(models.SettingKeyMonitor) if !cast.ToBool(monitor) { return nil } @@ -62,6 +62,9 @@ func (receiver *Monitoring) Handle(ctx console.Context) error { cpu.Flags = nil } + if internal.Status != internal.StatusNormal { + return nil + } err := facades.Orm().Query().Create(&models.Monitor{ Info: info, }) @@ -72,20 +75,16 @@ func (receiver *Monitoring) Handle(ctx console.Context) error { } // 删除过期数据 - err = facades.Orm().Query().Where("key", "monitor_days").First(&setting) + monitorDays := setting.Get(models.SettingKeyMonitorDays) + days, err := strconv.Atoi(monitorDays) if err != nil { return nil } - if setting.Value == "0" || len(setting.Value) == 0 { - return nil - } - days, err := strconv.Atoi(setting.Value) - if err != nil { + if days <= 0 || internal.Status != internal.StatusNormal { return nil } - _, err = facades.Orm().Query().Where("created_at < ?", carbon.Now().SubDays(days).ToDateTimeString()).Delete(&models.Monitor{}) - if err != nil { + if _, err = facades.Orm().Query().Where("created_at < ?", carbon.Now().SubDays(days).ToDateTimeString()).Delete(&models.Monitor{}); err != nil { facades.Log().Infof("[面板] 系统监控删除过期数据失败: %s", err.Error()) return nil }