Skip to content

Commit aea4f21

Browse files
author
Mrunal Patel
authored
Merge pull request opencontainers#1575 from cyphar/tty-resize-ignore-errors
signal: ignore tty.resize errors
2 parents 84a082b + 10b175c commit aea4f21

File tree

1 file changed

+6
-7
lines changed

1 file changed

+6
-7
lines changed

signals.go

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -74,16 +74,15 @@ func (h *signalHandler) forward(process *libcontainer.Process, tty *tty, detach
7474
}
7575
}
7676

77-
// perform the initial tty resize.
78-
if err := tty.resize(); err != nil {
79-
logrus.Error(err)
80-
}
77+
// Perform the initial tty resize. Always ignore errors resizing because
78+
// stdout might have disappeared (due to races with when SIGHUP is sent).
79+
_ = tty.resize()
80+
// Handle and forward signals.
8181
for s := range h.signals {
8282
switch s {
8383
case unix.SIGWINCH:
84-
if err := tty.resize(); err != nil {
85-
logrus.Error(err)
86-
}
84+
// Ignore errors resizing, as above.
85+
_ = tty.resize()
8786
case unix.SIGCHLD:
8887
exits, err := h.reap()
8988
if err != nil {

0 commit comments

Comments
 (0)