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

merge branch 'pr-1560' 

Check error return values

LGTMs: @crosbymichael @cyphar
Closes #1560
This commit is contained in:
Aleksa Sarai 2017-08-18 01:31:18 +10:00
parent ccd2c20aa4 4c5bf649d0
commit 59bbdc41a3
No known key found for this signature in database
GPG Key ID: 9E18AA267DDB8DB4
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
signals.go
View File

@ -75,11 +75,15 @@ func (h *signalHandler) forward(process *libcontainer.Process, tty *tty, detach
} }
// perform the initial tty resize. // perform the initial tty resize.
tty.resize() if err := tty.resize(); err != nil {
logrus.Error(err)
}
for s := range h.signals { for s := range h.signals {
switch s { switch s {
case unix.SIGWINCH: case unix.SIGWINCH:
tty.resize() if err := tty.resize(); err != nil {
logrus.Error(err)
}
case unix.SIGCHLD: case unix.SIGCHLD:
exits, err := h.reap() exits, err := h.reap()
if err != nil { if err != nil {

5
utils_linux.go
View File

@ -371,7 +371,10 @@ func startContainer(context *cli.Context, spec *specs.Spec, action CtAct, criuOp
} }
if notifySocket != nil { if notifySocket != nil {
notifySocket.setupSocket() err := notifySocket.setupSocket()
if err != nil {
return -1, err
}
} }
// Support on-demand socket activation by passing file descriptors into the container init process. // Support on-demand socket activation by passing file descriptors into the container init process.