update

Author: wenfengwang

internal/gateway/gateway.go

@@ -32,8 +32,9 @@ import (
 )
 
 const (
-	httpRequestPrefix = "/gateway"
-	xceVanusEventbus  = "xvanuseventbus"
+	httpRequestPrefix  = "/gateway"
+	xceVanusEventbus   = "xvanuseventbus"
+	ctrlProxyPortShift = 2
 )
 
 var (
@@ -60,7 +61,7 @@ type ceGateway struct {
 func NewGateway(config Config) *ceGateway {
 	return &ceGateway{
 		config: config,
-		cp:     newCtrlProxy(config.Port+2, allowCtrlProxyList, config.ControllerAddr),
+		cp:     newCtrlProxy(config.Port+ctrlProxyPortShift, allowCtrlProxyList, config.ControllerAddr),
 	}
 }
 

internal/gateway/grpc_proxy.go

@@ -68,12 +68,8 @@ func (cp *ctrlProxy) start(ctx context.Context) error {
 	}()
 
 	go func() {
-		for {
-			select {
-			case <-ctx.Done():
-				grpcServer.GracefulStop()
-			}
-		}
+		<-ctx.Done()
+		grpcServer.GracefulStop()
 	}()
 	go cp.updateLeader(ctx)
 	return nil
@@ -89,7 +85,7 @@ func (cp *ctrlProxy) director(ctx context.Context, fullMethodName string) (conte
 
 	_, exist := cp.allowProxyMethod[fullMethodName]
 	if !exist {
-		log.Warning(nil, "invalid access", map[string]interface{}{
+		log.Warning(ctx, "invalid access", map[string]interface{}{
 			"method": fullMethodName,
 		})
 		return outCtx, nil, status.Errorf(codes.Unimplemented, "Unknown method")
@@ -182,10 +178,11 @@ func createGRPCConn(ctx context.Context, addr string) *grpc.ClientConn {
 	ctx, cancel := context.WithCancel(ctx)
 	timeout := false
 	go func() {
-		ticker := time.Tick(time.Second)
+		ticker := time.NewTicker(time.Second)
+		defer ticker.Stop()
 		select {
 		case <-ctx.Done():
-		case <-ticker:
+		case <-ticker.C:
 			cancel()
 			timeout = true
 		}

internal/gateway/grpc_proxy_test.go

@@ -105,7 +105,7 @@ func Test_A(t *testing.T) {
 			So(res, ShouldBeNil)
 			So(err.Error(), ShouldContainSubstring, "No leader founded")
 			time.Sleep(100 * time.Millisecond)
-			res, err = pingCli.Ping(stdCtx.Background(), &empty.Empty{})
+			_, err = pingCli.Ping(stdCtx.Background(), &empty.Empty{})
 			So(err.Error(), ShouldContainSubstring, "Unknown method")
 		})
 
@@ -159,6 +159,14 @@ func Test_A(t *testing.T) {
 			res, err := ebCli.ListEventBus(ctx, &empty.Empty{})
 			So(err, ShouldBeNil)
 			So(res.Eventbus, ShouldHaveLength, 4)
+			So(res.Eventbus[0].Name, ShouldEqual, "battle1")
+			So(res.Eventbus[0].Id, ShouldEqual, 1)
+			So(res.Eventbus[1].Name, ShouldEqual, "battle2")
+			So(res.Eventbus[1].Id, ShouldEqual, 2)
+			So(res.Eventbus[2].Name, ShouldEqual, "battle3")
+			So(res.Eventbus[2].Id, ShouldEqual, 3)
+			So(res.Eventbus[3].Name, ShouldEqual, "battle4")
+			So(res.Eventbus[3].Id, ShouldEqual, 4)
 		})
 
 		cancel()