Merge pull request #3050 from jterry75/fix_cpu_cap

Fix a bug in shim log on Windows that can cause 100% CPU utilization
2019-02-27 17:32:38 -08:00
parent e72ad44427 828f6eb842
commit c24a74354c
1 changed files with 1 additions and 1 deletions
--- a/runtime/v2/shim_windows.go
+++ b/runtime/v2/shim_windows.go
@@ -78,7 +78,7 @@ func openShimLog(ctx context.Context, bundle *Bundle) (io.ReadCloser, error) {
 			time.Second*10,
 		)
 		if conerr != nil {
-			dpc.conerr = errors.Wrap(err, "failed to connect to shim log")
+			dpc.conerr = errors.Wrap(conerr, "failed to connect to shim log")
 		}
 		dpc.c = c
 		dpc.wg.Done()