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

🎨 不通过 timeout 命令控制执行超时

This commit is contained in:
Liang Ding 2019-05-19 00:45:49 +08:00
parent e952c8fa09
commit 9a16c9214f
No known key found for this signature in database
GPG Key ID: 136F30F901A2231D
2 changed files with 46 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
output/run.go
View File

@ -22,6 +22,7 @@ import (
"os/exec"
"path/filepath"
"strings"
"time"
"github.com/b3log/wide/conf"
"github.com/b3log/wide/session"
@ -51,7 +52,7 @@ func RunHandler(w http.ResponseWriter, r *http.Request) {
var cmd *exec.Cmd
if conf.Docker {
fileName := filepath.Base(filePath)
cmd = exec.Command("timeout", "-s", "9", "5", "docker", "run", "--rm", "--cpus", "0.1", "-v", filePath+":/"+fileName, conf.DockerImageGo, "/"+fileName)
cmd = exec.Command("docker", "run", "--rm", "--cpus", "0.1", "-v", filePath+":/"+fileName, conf.DockerImageGo, "/"+fileName)
} else {
cmd = exec.Command(filePath)
curDir := filepath.Dir(filePath)
@ -88,6 +89,9 @@ func RunHandler(w http.ResponseWriter, r *http.Request) {
return
}
done := make(chan error)
go func() { done <- cmd.Wait() }()
channelRet["pid"] = cmd.Process.Pid
// add the process to user's process set
@ -103,6 +107,7 @@ func RunHandler(w http.ResponseWriter, r *http.Request) {
}
}
rid := rand.Int()
go func(runningId int) {
defer util.Recover()
@ -147,25 +152,26 @@ func RunHandler(w http.ResponseWriter, r *http.Request) {
wsChannel.Refresh()
}
}
}(rid)
cmd.Wait()
// remove the exited process from user's process set
Processes.Remove(wSession, cmd.Process)
after := time.After(5 * time.Second)
channelRet["cmd"] = "run-done"
// timeout: https://www.gnu.org/software/coreutils/manual/html_node/timeout-invocation.html
exitCode := cmd.ProcessState.ExitCode()
if 124 == exitCode || 125 == exitCode || 137 == exitCode {
select {
case <-after:
cmd.Process.Kill()
channelRet["output"] = "<span class='stderr'>run program timeout in 5s</span>\n"
} else {
case <-done:
channelRet["output"] = "\n<span class='stderr'>run program complete</span>\n"
}
Processes.Remove(wSession, cmd.Process)
logger.Debugf("User [%s, %s] done running [id=%d, file=%s]", wSession.UserId, sid, rid, filePath)
if nil != wsChannel {
wsChannel.WriteJSON(&channelRet)
wsChannel.Refresh()
}
}(rand.Int())
}
// StopHandler handles request of stoping a running process.

28
playground/run.go
View File

@ -22,6 +22,7 @@ import (
"os/exec"
"path/filepath"
"strings"
"time"
"github.com/b3log/wide/conf"
"github.com/b3log/wide/output"
@ -52,7 +53,7 @@ func RunHandler(w http.ResponseWriter, r *http.Request) {
var cmd *exec.Cmd
if conf.Docker {
fileName := filepath.Base(filePath)
cmd = exec.Command("timeout", "-s", "9", "5", "docker", "run", "--rm", "--cpus", "0.1", "-v", filePath+":/"+fileName, conf.DockerImageGo, "/"+fileName)
cmd = exec.Command("docker", "run", "--rm", "--cpus", "0.1", "-v", filePath+":/"+fileName, conf.DockerImageGo, "/"+fileName)
} else {
cmd = exec.Command(filePath)
curDir := filepath.Dir(filePath)
@ -90,6 +91,9 @@ func RunHandler(w http.ResponseWriter, r *http.Request) {
return
}
done := make(chan error)
go func() { done <- cmd.Wait() }()
channelRet["pid"] = cmd.Process.Pid
// add the process to user's process set
@ -105,6 +109,7 @@ func RunHandler(w http.ResponseWriter, r *http.Request) {
}
}
rid := rand.Int()
go func(runningId int) {
defer util.Recover()
@ -149,23 +154,26 @@ func RunHandler(w http.ResponseWriter, r *http.Request) {
wsChannel.Refresh()
}
}
}(rid)
cmd.Wait()
// remove the exited process from user's process set
output.Processes.Remove(wSession, cmd.Process)
after := time.After(5 * time.Second)
channelRet["cmd"] = "run-done"
// timeout: https://www.gnu.org/software/coreutils/manual/html_node/timeout-invocation.html
exitCode := cmd.ProcessState.ExitCode()
if 124 == exitCode || 125 == exitCode || 137 == exitCode {
select {
case <-after:
cmd.Process.Kill()
channelRet["output"] = "\nrun program timeout in 5s\n"
case <-done:
channelRet["output"] = "\nrun program complete\n"
}
output.Processes.Remove(wSession, cmd.Process)
logger.Debugf("User [%s, %s] done running [id=%d, file=%s]", wSession.UserId, sid, rid, filePath)
if nil != wsChannel {
wsChannel.WriteJSON(&channelRet)
wsChannel.Refresh()
}
}(rand.Int())
}
// StopHandler handles request of stoping a running process.