Use struct instead of map, rewrite api of killing process

job.go

@@ -452,7 +452,9 @@ func (j *Job) Run() bool {
 		JobID:  j.ID,
 		Group:  j.Group,
 		NodeID: j.runOn,
-		Time:   t,
+		ProcessVal: ProcessVal{
+			Time: t,
+		},
 	}
 	proc.Start()
 	defer proc.Stop()

node/node.go

@@ -476,11 +476,12 @@ func (n *Node) watchExcutingProc() {
 				}
 
 				val := string(ev.Kv.Value)
-				err = json.Unmarshal([]byte(val), process)
+				pv := &cronsun.ProcessVal{}
+				err = json.Unmarshal([]byte(val), pv)
 				if err != nil {
 					continue
 				}
-
+				process.ProcessVal = *pv
 				if process.Killed {
 					n.KillExcutingProc(process)
 				}

proc.go

@@ -128,12 +128,13 @@ func (l *leaseID) keepAlive() {
 // value: 开始执行时间
 // key 会自动过期，防止进程意外退出后没有清除相关 key，过期时间可配置
 type Process struct {
-	ID     string    `json:"id"` // pid
-	JobID  string    `json:"jobId"`
-	Group  string    `json:"group"`
-	NodeID string    `json:"nodeId"`
-	Time   time.Time `json:"time"`   // 开始执行时间
-	Killed bool      `json:"killed"` // 是否强制杀死
+	// parse from key path
+	ID     string `json:"id"` // pid
+	JobID  string `json:"jobId"`
+	Group  string `json:"group"`
+	NodeID string `json:"nodeId"`
+	// parse from value
+	ProcessVal
 
 	running int32
 	hasPut  int32
@@ -141,6 +142,11 @@ type Process struct {
 	done    chan struct{}
 }
 
+type ProcessVal struct {
+	Time   time.Time `json:"time"`   // 开始执行时间
+	Killed bool      `json:"killed"` // 是否强制杀死
+}
+
 func GetProcFromKey(key string) (proc *Process, err error) {
 	ss := strings.Split(key, "/")
 	var sslen = len(ss)
@@ -163,16 +169,15 @@ func (p *Process) Key() string {
 }
 
 func (p *Process) Val() (string, error) {
-	val := struct {
-		Time   string `json:"time"`
-		Killed bool   `json:"killed"`
-	}{p.Time.Format(time.RFC3339), p.Killed}
+	b, err := json.Marshal(&p.ProcessVal)
+	if err != nil {
+		return "", err
+	}
 
-	str, err := json.Marshal(val)
-	return string(str), err
+	return string(b), nil
 }
 
-// 获取结点正在执行任务的数量
+// 获取节点正在执行任务的数量
 func (j *Job) CountRunning() (int64, error) {
 	resp, err := DefalutClient.Get(conf.Config.Proc+j.runOn+"/"+j.Group+"/"+j.ID, client.WithPrefix(), client.WithCountOnly())
 	if err != nil {

web/job.go

@@ -351,9 +351,13 @@ func (j *Job) GetExecutingJob(ctx *Context) {
 		}
 
 		val := string(gresp.Kvs[i].Value)
-		var p cronsun.Process
-		json.Unmarshal([]byte(val), &p)
-
+		var pv = &cronsun.ProcessVal{}
+		err = json.Unmarshal([]byte(val), pv)
+		if err != nil {
+			log.Errorf("Failed to unmarshal ProcessVal from val: %s", err.Error())
+			continue
+		}
+		proc.ProcessVal = *pv
 		list = append(list, proc)
 	}
 
@@ -362,45 +366,56 @@ func (j *Job) GetExecutingJob(ctx *Context) {
 }
 
 func (j *Job) KillExecutingJob(ctx *Context) {
-	vars := mux.Vars(ctx.R)
-	id := strings.TrimSpace(vars["id"])
-	id = strings.Replace(id, ".", "/", -1)
+	proc := &cronsun.Process{
+		ID:     getStringVal("pid", ctx.R),
+		JobID:  getStringVal("job", ctx.R),
+		Group:  getStringVal("group", ctx.R),
+		NodeID: getStringVal("node", ctx.R),
+	}
 
-	procKey := conf.Config.Proc + id
+	if proc.ID == "" || proc.JobID == "" || proc.Group == "" || proc.NodeID == "" {
+		outJSONWithCode(ctx.W, http.StatusBadRequest, "Invalid process info.")
+		return
+	}
+
+	procKey := proc.Key()
 	resp, err := cronsun.DefalutClient.Get(procKey)
-
 	if err != nil {
 		outJSONWithCode(ctx.W, http.StatusInternalServerError, err.Error())
 		return
 	}
 
 	if len(resp.Kvs) < 1 {
-		outJSONWithCode(ctx.W, http.StatusInternalServerError, nil)
+		outJSONWithCode(ctx.W, http.StatusNotFound, "Porcess not found")
 		return
 	}
 
-	var procVal cronsun.Process
+	var procVal = &cronsun.ProcessVal{}
 	err = json.Unmarshal(resp.Kvs[0].Value, &procVal)
-
 	if err != nil {
 		outJSONWithCode(ctx.W, http.StatusInternalServerError, err.Error())
 		return
 	}
+	if procVal.Killed {
+		outJSONWithCode(ctx.W, http.StatusOK, "Killing process")
+		return
+	}
 
 	procVal.Killed = true
-	newVal, err := json.Marshal(procVal)
+	proc.ProcessVal = *procVal
+	str, err := proc.Val()
 	if err != nil {
 		outJSONWithCode(ctx.W, http.StatusInternalServerError, err.Error())
 		return
 	}
 
-	_, err = cronsun.DefalutClient.Put(procKey, string(newVal))
+	_, err = cronsun.DefalutClient.Put(procKey, str)
 	if err != nil {
 		outJSONWithCode(ctx.W, http.StatusInternalServerError, err.Error())
 		return
 	}
 
-	outJSONWithCode(ctx.W, http.StatusOK, "杀死进程成功")
+	outJSONWithCode(ctx.W, http.StatusOK, "Killing process")
 }
 
 type ProcFetchOptions struct {

web/routers.go

@@ -78,7 +78,7 @@ func initRouters() (s *http.Server, err error) {
 
 	// kill an executing job
 	h = NewAuthHandler(jobHandler.KillExecutingJob, cronsun.Developer)
-	subrouter.Handle("/job/executing/{id}", h).Methods("DELETE")
+	subrouter.Handle("/job/executing", h).Methods("DELETE")
 
 	// get job log list
 	h = NewAuthHandler(jobLogHandler.GetList, cronsun.Reporter)

web/ui/src/components/JobExecuting.vue

@@ -105,9 +105,13 @@ export default {
 
     killProc(proc, index) {
       if (!confirm(this.$L("whether to kill the process"))) return;
-      
-      var id = proc.nodeId + "." + proc.group + "." + proc.jobId + "." + proc.id;
-      this.$rest.DELETE('job/executing/' + id)
+      var vm = this
+      var params = []
+      params.push('node='+proc.nodeId)
+      params.push('group='+proc.group)
+      params.push('job='+proc.jobId)
+      params.push('pid='+proc.id)
+      this.$rest.DELETE('job/executing?' + params.join('&'))
       .onsucceed(200, (resp) => {
         this.executings.splice(index, 1);
       })