diff --git a/service/cron_service/cron_service.go b/service/cron_service/cron_service.go
index 5a74b48..809380d 100644
--- a/service/cron_service/cron_service.go
+++ b/service/cron_service/cron_service.go
@@ -75,6 +75,7 @@ func (cs *CronService) UpdateLogsCronRun(cron string) {
// StartLogsCronRun 启动的时候开启定时任务
func StartLogsCronRun() {
+ logrus.Infof("开始注册定时清除日志任务...")
cs := CronService{}
cs.StartLogsCronRun()
}
diff --git a/service/cron_service/tasks.go b/service/cron_service/tasks.go
index fec26fc..ae74315 100644
--- a/service/cron_service/tasks.go
+++ b/service/cron_service/tasks.go
@@ -1,9 +1,11 @@
package cron_service
import (
- "fmt"
"github.com/robfig/cron/v3"
"github.com/sirupsen/logrus"
+ "reflect"
+ "runtime"
+ "strings"
"sync"
)
@@ -26,23 +28,30 @@ func init() {
TaskList = make(map[cron.EntryID]*ScheduledTask)
}
-// 添加定时任务
+func getFunctionName(f interface{}) string {
+ ptr := runtime.FuncForPC(reflect.ValueOf(f).Pointer()).Name()
+ name := ptr[strings.LastIndex(ptr, ".")+1:]
+ return name
+}
+
+// AddTask 添加定时任务
func AddTask(task ScheduledTask) cron.EntryID {
mutex.Lock()
defer mutex.Unlock()
+ jobName := getFunctionName(task.Job)
taskId, err := CronInstance.AddFunc(task.Schedule, task.Job)
if err != nil {
// 处理错误
- logrus.Error(fmt.Sprintf("添加定时任务失败，原因：%s", err))
+ logrus.Errorf("注册定时任务失败, job: %s, 原因：%s", jobName, err)
} else {
TaskList[taskId] = &task
- logrus.Info(fmt.Sprintf("添加定时任务成功，entryID: %d, cron: %s", taskId, task.Schedule))
+ logrus.Infof("注册定时任务成功, job: %s, entryID: %d, cron: %s", jobName, taskId, task.Schedule)
}
return taskId
}
-// 删除定时任务
+// RemoveTask 删除定时任务
func RemoveTask(taskID cron.EntryID) {
mutex.Lock()
defer mutex.Unlock()
diff --git a/web/src/views/tabsTools/sendLogs/sendLogs.vue b/web/src/views/tabsTools/sendLogs/sendLogs.vue
index 28a2e1a..4413884 100644
--- a/web/src/views/tabsTools/sendLogs/sendLogs.vue
+++ b/web/src/views/tabsTools/sendLogs/sendLogs.vue
@@ -20,7 +20,7 @@
-
+
日志