beego task list update for task spec list and task run url error
Showing
3 changed files
with
14 additions
and
4 deletions
| ... | @@ -397,7 +397,7 @@ func taskStatus(rw http.ResponseWriter, req *http.Request) { | ... | @@ -397,7 +397,7 @@ func taskStatus(rw http.ResponseWriter, req *http.Request) { |
| 397 | if err != nil { | 397 | if err != nil { |
| 398 | data["Message"] = []string{"error", fmt.Sprintf("%s", err)} | 398 | data["Message"] = []string{"error", fmt.Sprintf("%s", err)} |
| 399 | } | 399 | } |
| 400 | data["Message"] = []string{"success", fmt.Sprintf("%s run success,Now the Status is %s", taskname, t.GetStatus())} | 400 | data["Message"] = []string{"success", fmt.Sprintf("%s run success,Now the Status is <br>%s", taskname, t.GetStatus())} |
| 401 | } else { | 401 | } else { |
| 402 | data["Message"] = []string{"warning", fmt.Sprintf("there's no task which named: %s", taskname)} | 402 | data["Message"] = []string{"warning", fmt.Sprintf("there's no task which named: %s", taskname)} |
| 403 | } | 403 | } |
| ... | @@ -410,12 +410,14 @@ func taskStatus(rw http.ResponseWriter, req *http.Request) { | ... | @@ -410,12 +410,14 @@ func taskStatus(rw http.ResponseWriter, req *http.Request) { |
| 410 | var fields = []string{ | 410 | var fields = []string{ |
| 411 | fmt.Sprintf("Task Name"), | 411 | fmt.Sprintf("Task Name"), |
| 412 | fmt.Sprintf("Task Spec"), | 412 | fmt.Sprintf("Task Spec"), |
| 413 | fmt.Sprintf("Task Function"), | 413 | fmt.Sprintf("Task Status"), |
| 414 | fmt.Sprintf("Last Time"), | ||
| 414 | fmt.Sprintf(""), | 415 | fmt.Sprintf(""), |
| 415 | } | 416 | } |
| 416 | for tname, tk := range toolbox.AdminTaskList { | 417 | for tname, tk := range toolbox.AdminTaskList { |
| 417 | result = []string{ | 418 | result = []string{ |
| 418 | fmt.Sprintf("%s", tname), | 419 | fmt.Sprintf("%s", tname), |
| 420 | fmt.Sprintf("%s", tk.GetSpec()), | ||
| 419 | fmt.Sprintf("%s", tk.GetStatus()), | 421 | fmt.Sprintf("%s", tk.GetStatus()), |
| 420 | fmt.Sprintf("%s", tk.GetPrev().String()), | 422 | fmt.Sprintf("%s", tk.GetPrev().String()), |
| 421 | } | 423 | } | ... | ... |
| ... | @@ -186,7 +186,7 @@ bg-warning | ... | @@ -186,7 +186,7 @@ bg-warning |
| 186 | </td> | 186 | </td> |
| 187 | {{end}} | 187 | {{end}} |
| 188 | <td> | 188 | <td> |
| 189 | <a class="btn btn-primary btn-sm" href="/task?taskname={{index $slice 1}}">Run</a> | 189 | <a class="btn btn-primary btn-sm" href="/task?taskname={{index $slice 0}}">Run</a> |
| 190 | </td> | 190 | </td> |
| 191 | </tr> | 191 | </tr> |
| 192 | {{end}} | 192 | {{end}} | ... | ... |
| ... | @@ -84,6 +84,7 @@ type TaskFunc func() error | ... | @@ -84,6 +84,7 @@ type TaskFunc func() error |
| 84 | 84 | ||
| 85 | // task interface | 85 | // task interface |
| 86 | type Tasker interface { | 86 | type Tasker interface { |
| 87 | GetSpec() string | ||
| 87 | GetStatus() string | 88 | GetStatus() string |
| 88 | Run() error | 89 | Run() error |
| 89 | SetNext(time.Time) | 90 | SetNext(time.Time) |
| ... | @@ -102,6 +103,7 @@ type taskerr struct { | ... | @@ -102,6 +103,7 @@ type taskerr struct { |
| 102 | type Task struct { | 103 | type Task struct { |
| 103 | Taskname string | 104 | Taskname string |
| 104 | Spec *Schedule | 105 | Spec *Schedule |
| 106 | SpecStr string | ||
| 105 | DoFunc TaskFunc | 107 | DoFunc TaskFunc |
| 106 | Prev time.Time | 108 | Prev time.Time |
| 107 | Next time.Time | 109 | Next time.Time |
| ... | @@ -116,16 +118,22 @@ func NewTask(tname string, spec string, f TaskFunc) *Task { | ... | @@ -116,16 +118,22 @@ func NewTask(tname string, spec string, f TaskFunc) *Task { |
| 116 | Taskname: tname, | 118 | Taskname: tname, |
| 117 | DoFunc: f, | 119 | DoFunc: f, |
| 118 | ErrLimit: 100, | 120 | ErrLimit: 100, |
| 121 | SpecStr: spec, | ||
| 119 | } | 122 | } |
| 120 | task.SetCron(spec) | 123 | task.SetCron(spec) |
| 121 | return task | 124 | return task |
| 122 | } | 125 | } |
| 123 | 126 | ||
| 127 | //get spec string | ||
| 128 | func (s *Task) GetSpec() string { | ||
| 129 | return s.SpecStr | ||
| 130 | } | ||
| 131 | |||
| 124 | // get current task status | 132 | // get current task status |
| 125 | func (tk *Task) GetStatus() string { | 133 | func (tk *Task) GetStatus() string { |
| 126 | var str string | 134 | var str string |
| 127 | for _, v := range tk.Errlist { | 135 | for _, v := range tk.Errlist { |
| 128 | str += v.t.String() + ":" + v.errinfo + "\n" | 136 | str += v.t.String() + ":" + v.errinfo + "<br>" |
| 129 | } | 137 | } |
| 130 | return str | 138 | return str |
| 131 | } | 139 | } | ... | ... |
-
Please register or sign in to post a comment