OSSInnovation
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #997 from xiekeyang/defer 

let defer function
This commit is contained in:
Daniel, Dao Quang Minh 2016-08-24 11:15:53 +01:00 committed by GitHub
parent e43f740ed7 200f8cb69d
commit c92d105863
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
utils_linux.go
View File

@ -234,27 +234,24 @@ func (r *runner) run(config *specs.Process) (int, error) {
if !r.create {
startFn = r.container.Run
}
defer tty.Close()
if err := startFn(process); err != nil {
r.destroy()
tty.Close()
return -1, err
}
if err := tty.ClosePostStart(); err != nil {
r.terminate(process)
r.destroy()
tty.Close()
return -1, err
}
if r.pidFile != "" {
if err := createPidFile(r.pidFile, process); err != nil {
r.terminate(process)
r.destroy()
tty.Close()
return -1, err
}
}
if r.detach || r.create {
tty.Close()
return 0, nil
}
status, err := handler.forward(process)
@ -262,7 +259,6 @@ func (r *runner) run(config *specs.Process) (int, error) {
r.terminate(process)
}
r.destroy()
tty.Close()
return status, err
}