mbk-lab
/
wide
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

🎨 kill 命令日志

This commit is contained in:
Liang Ding 2019-05-19 01:25:41 +08:00
parent b84338bb87
commit ff3546a844
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
session/processes.go
View File

@ -167,6 +167,7 @@ func RunHandler(w http.ResponseWriter, r *http.Request, channel map[string]*util
after := time.After(5 * time.Second) after := time.After(5 * time.Second)
channelRet["cmd"] = "run-done" channelRet["cmd"] = "run-done"
kill := false
select { select {
case <-after: case <-after:
if conf.Docker { if conf.Docker {
@ -179,12 +180,13 @@ func RunHandler(w http.ResponseWriter, r *http.Request, channel map[string]*util
} }
channelRet["output"] = "<span class='stderr'>run program timeout in 5s</span>\n" channelRet["output"] = "<span class='stderr'>run program timeout in 5s</span>\n"
kill = true
case <-done: case <-done:
channelRet["output"] = "\n<span class='stderr'>run program complete</span>\n" channelRet["output"] = "\n<span class='stderr'>run program complete</span>\n"
} }
Processes.Remove(wSession, cmd.Process) Processes.Remove(wSession, cmd.Process)
logger.Debugf("User [%s, %s] done running [id=%s, file=%s]", wSession.UserId, sid, rid, filePath) logger.Debugf("User [%s, %s] done running [id=%s, file=%s, kill=%v]", wSession.UserId, sid, rid, filePath, kill)
if nil != wsChannel { if nil != wsChannel {
wsChannel.WriteJSON(&channelRet) wsChannel.WriteJSON(&channelRet)