Merge pull request #512 from teawater/grpc

Julio Montes · web-flow · commit 7ce9fa577b84 · 2019-04-03T07:26:29.000-06:00
agent: Fix "agent grpc server quits" show wrong error
diff --git a/agent.go b/agent.go
@@ -1068,7 +1068,7 @@ func (s *sandbox) startGRPC() {
 			// l is closed when Serve() returns
 			servErr = grpcServer.Serve(l)
 			if servErr != nil {
-				agentLog.WithError(err).Warn("agent grpc server quits")
+				agentLog.WithError(servErr).Warn("agent grpc server quits")
 			}
 
 			err = s.channel.teardown()

Original file line number	Diff line number	Diff line change
`@@ -1068,7 +1068,7 @@ func (s *sandbox) startGRPC() {`
`1068`	`1068`	`// l is closed when Serve() returns`
`1069`	`1069`	`servErr = grpcServer.Serve(l)`
`1070`	`1070`	`if servErr != nil {`
`1071`		`- agentLog.WithError(err).Warn("agent grpc server quits")`
	`1071`	`+ agentLog.WithError(servErr).Warn("agent grpc server quits")`
`1072`	`1072`	`}`
`1073`	`1073`
`1074`	`1074`	`err = s.channel.teardown()`