JOJ/JOJ3
24
5
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases Wiki Activity

fix(executor/local): wait after kill
All checks were successful
submodules sync / sync (push) Successful in 39s
Details
build / build (push) Successful in 2m14s
Details
build / trigger-build-image (push) Successful in 13s
Details

Browse Source
This commit is contained in:
张泊明518370910136 2025-03-21 01:38:38 -04:00
parent 33d26be20c
commit a53cb6451e
Signed by: 张泊明518370910136
GPG Key ID: D47306D7062CDA9D
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
internal/executor/local/executor.go
View File

@ -27,6 +27,9 @@ func (e *Local) generateResult(
ExitStatus: processState.ExitCode(), ExitStatus: processState.ExitCode(),
Error: "", Error: "",
Time: func() uint64 { Time: func() uint64 {
if isTimeout {
return 0
}
nanos := processState.UserTime().Nanoseconds() nanos := processState.UserTime().Nanoseconds()
if nanos < 0 { if nanos < 0 {
return 0 return 0
@ -148,8 +151,9 @@ func (e *Local) Run(cmds []stage.Cmd) ([]stage.ExecutorResult, error) {
results = append(results, result) results = append(results, result)
case <-time.After(duration): case <-time.After(duration):
_ = execCmd.Process.Kill() _ = execCmd.Process.Kill()
err := execCmd.Wait()
result := e.generateResult( result := e.generateResult(
nil, err,
execCmd.ProcessState, execCmd.ProcessState,
duration, duration,
cmd, cmd,