Amend 3cc0cea

gandro · michi-covalent · commit 44fe5df99be3 · 2020-04-15T10:37:07.000-07:00
Somehow I lost a part of this commit.

Signed-off-by: Sebastian Wicki &lt;sebastian@isovalent.com&gt;
Signed-off-by: Michi Mutsuzaki &lt;michi@isovalent.com&gt;
diff --git a/pkg/server/local_observer.go b/pkg/server/local_observer.go
@@ -240,6 +240,7 @@ func (s *LocalObserverServer) GetFlows(
 }
 
 func getFlows(
+	ctx context.Context,
 	req *observer.GetFlowsRequest,
 	server observer.Observer_GetFlowsServer,
 	obs GRPCServer,
@@ -273,7 +274,7 @@ func getFlows(
 	}
 
 	for ; ; i++ {
-		flow, err := flowsReader.Next(server.Context())
+		flow, err := flowsReader.Next(ctx)
 		if err != nil {
 			if err == io.EOF {
 				return nil

Original file line number	Diff line number	Diff line change
`@@ -240,6 +240,7 @@ func (s *LocalObserverServer) GetFlows(`
`240`	`240`	`}`
`241`	`241`
`242`	`242`	`func getFlows(`
	`243`	`+ ctx context.Context,`
`243`	`244`	`req *observer.GetFlowsRequest,`
`244`	`245`	`server observer.Observer_GetFlowsServer,`
`245`	`246`	`obs GRPCServer,`
`@@ -273,7 +274,7 @@ func getFlows(`
`273`	`274`	`}`
`274`	`275`
`275`	`276`	`for ; ; i++ {`
`276`		`- flow, err := flowsReader.Next(server.Context())`
	`277`	`+ flow, err := flowsReader.Next(ctx)`
`277`	`278`	`if err != nil {`
`278`	`279`	`if err == io.EOF {`
`279`	`280`	`return nil`