Skip to content

Commit

Permalink
merge branch 'pr-1560'
Browse files Browse the repository at this point in the history
  Check error return values

LGTMs: @crosbymichael @cyphar
Closes #1560
  • Loading branch information
cyphar committed Aug 17, 2017
2 parents ccd2c20 + 4c5bf64 commit 59bbdc4
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 3 deletions.
8 changes: 6 additions & 2 deletions signals.go
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,15 @@ func (h *signalHandler) forward(process *libcontainer.Process, tty *tty, detach
}

// perform the initial tty resize.
tty.resize()
if err := tty.resize(); err != nil {
logrus.Error(err)
}
for s := range h.signals {
switch s {
case unix.SIGWINCH:
tty.resize()
if err := tty.resize(); err != nil {
logrus.Error(err)
}
case unix.SIGCHLD:
exits, err := h.reap()
if err != nil {
Expand Down
5 changes: 4 additions & 1 deletion utils_linux.go
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,10 @@ func startContainer(context *cli.Context, spec *specs.Spec, action CtAct, criuOp
}

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.
Expand Down

0 comments on commit 59bbdc4

Please sign in to comment.