Merge pull request #3355 from Ace-Tang/avoid-start-hang

estesp · web-flow · commit 4355a2accce6 · 2019-06-19T11:29:27.000+01:00
Add timeout in load shim v2
diff --git a/runtime/v2/shim.go b/runtime/v2/shim.go
@@ -100,6 +100,8 @@ func loadShim(ctx context.Context, bundle *Bundle, events *exchange.Exchange, rt
 		events:  events,
 		rtTasks: rt,
 	}
+	ctx, cancel := context.WithTimeout(ctx, 5*time.Second)
+	defer cancel()
 	if err := s.Connect(ctx); err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -100,6 +100,8 @@ func loadShim(ctx context.Context, bundle Bundle, events exchange.Exchange, rt`
`100`	`100`	`events: events,`
`101`	`101`	`rtTasks: rt,`
`102`	`102`	`}`
	`103`	`+ ctx, cancel := context.WithTimeout(ctx, 5*time.Second)`
	`104`	`+ defer cancel()`
`103`	`105`	`if err := s.Connect(ctx); err != nil {`
`104`	`106`	`return nil, err`
`105`	`107`	`}`