Fix panic in shim not logged

mxpv · mxpv · commit 4da306e1e98a · 2020-10-26T09:05:47.000-07:00
Fix #4274 Carry #4298 Signed-off-by: Maksym Pavlenko <pavlenko.maksym@gmail.com>
diff --git a/runtime/v2/shim/shim_unix.go b/runtime/v2/shim/shim_unix.go
@@ -90,5 +90,5 @@ func handleSignals(ctx context.Context, logger *logrus.Entry, signals chan os.Si
 }
 
 func openLog(ctx context.Context, _ string) (io.Writer, error) {
-	return fifo.OpenFifo(ctx, "log", unix.O_WRONLY, 0700)
+	return fifo.OpenFifoDup2(ctx, "log", unix.O_WRONLY, 0700, int(os.Stderr.Fd()))
 }

Original file line number	Diff line number	Diff line change
`@@ -90,5 +90,5 @@ func handleSignals(ctx context.Context, logger *logrus.Entry, signals chan os.Si`
`90`	`90`	`}`
`91`	`91`
`92`	`92`	`func openLog(ctx context.Context, _ string) (io.Writer, error) {`
`93`		`- return fifo.OpenFifo(ctx, "log", unix.O_WRONLY, 0700)`
	`93`	`+ return fifo.OpenFifoDup2(ctx, "log", unix.O_WRONLY, 0700, int(os.Stderr.Fd()))`
`94`	`94`	`}`