新增grpc平滑关闭，修复createrole的bug，新增的函数

zhangqijia
1 parent 286f6dbe
Showing 13 changed files with 107 additions and 76 deletions Show diff stats
README.md
actions/accountaction.go
actions/basic.go
actions/roleaction.go
actions/server.go
cmd/account.go
cmd/game.go
components/db/mongo.go
components/etcd/etcd.go
models/role.go
protos
test/client.go
utils/utils.go
@@ -32,8 +32,4 @@ $ make run
 测试
 ```shell
 $ make test
-```
-
-
-
-
+```
 \ No newline at end of file
@@ -60,7 +60,7 @@ func (s *AccountServer) CreateTokenHandler(ctx context.Context, in *pb.AccountIn
 		Rsp: &pb.PubRsp{
 			Code: 0,
 		},
-		Token: utils.CreateToken(in),
+		Token: utils.CreateToken(m.AccountInfo),
 		GameService: gameInfo,
 	}, nil
 }
@@ -2,15 +2,18 @@ package actions
  
 import (
 	"fmt"
+	"google.golang.org/grpc"
 	"net"
 	"pro2d/components/db"
 	"pro2d/components/etcd"
 	"pro2d/conf"
+	"pro2d/utils"
 )
  
 type BasicServer struct {
-	SConf  *conf.SConf
+	SConf      *conf.SConf
 	EtcdClient *etcd.EtcdClient
+	GrpcServer *grpc.Server
 }
  
 func NewServer() *BasicServer {
@@ -34,5 +37,8 @@ func (b *BasicServer) Start(sConf *conf.SConf) (net.Listener, error) {
 	return lis, err
 }
  
-func (b *BasicServer) Close()  {
+func (b *BasicServer) Stop()  {
+	utils.Sugar.Debugf("平滑关闭服务")
+	b.EtcdClient.Close()
+	b.GrpcServer.GracefulStop()
 }
@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"google.golang.org/grpc/metadata"
+	"pro2d/conf"
 	"pro2d/models"
 	"pro2d/protos/pb"
 	"pro2d/utils"
@@ -45,11 +46,9 @@ func (s *GameServer) CreateRoleHandler(ctx context.Context, in *pb.Token) (*pb.R
 	}
 	ok, role := models.RoleExistByUid(account.Uid)
 	if !ok {
-		*role.Role = pb.Role{
-			Level:     0,
-			Device:    account.Device,
-			Uid:       account.Uid,
-		}
+		role = models.NewRole(conf.SnowFlack.NextVal())
+		role.Role.Device = account.Device
+		role.Role.Uid = account.Uid
 		role.Create()
  
 	}
@@ -67,6 +66,7 @@ func (s *GameServer) LoginHandler(ctx context.Context, in *pb.Token) (*pb.RoleRs
 	if account == nil {
 		return nil, fmt.Errorf("token is error")
 	}
+	utils.Sugar.Debugf("login account: %v", account)
 	ok, role := models.RoleExistByUid(account.Uid)
 	if !ok {
 		return &pb.RoleRsp{
@@ -39,20 +39,20 @@ func (s *AccountServer)Start() error {
 	models.InitAccountServerModels()
  
 	//new一个grpc
-	gs := grpc.NewServer(grpc.UnaryInterceptor(AccountServerInterceptor))
+	s.GrpcServer = grpc.NewServer(grpc.UnaryInterceptor(AccountServerInterceptor))
  
-	pb.RegisterAccountServer(gs, s)
-	reflection.Register(gs) //在给定的gRPC服务器上注册服务器反射服务
+	pb.RegisterAccountServer(s.GrpcServer, s)
+	reflection.Register(s.GrpcServer) //在给定的gRPC服务器上注册服务器反射服务
  
 	// Serve方法在lis上接受传入连接，为每个连接创建一个ServerTransport和server的goroutine。
 	// 该goroutine读取gRPC请求，然后调用已注册的处理程序来响应它们。
 	utils.Sugar.Debugf("Start AccountServer listening on %d", conf.GlobalConf.AccountConf.Port)
  
-	return gs.Serve(lis)
+	return s.GrpcServer.Serve(lis)
 }
  
 func (s *AccountServer)Stop()  {
-	s.BasicServer.Close()
+	s.BasicServer.Stop()
 }
  
 type GameServer struct{
@@ -83,17 +83,17 @@ func (s *GameServer)Start() error {
 	models.InitGameServerModels()
  
 	//new一个grpc
-	gs := grpc.NewServer(grpc.UnaryInterceptor(GameServerInterceptor))
+	s.GrpcServer = grpc.NewServer(grpc.UnaryInterceptor(GameServerInterceptor))
  
-	pb.RegisterGameServer(gs, s)
-	reflection.Register(gs) //在给定的gRPC服务器上注册服务器反射服务
+	pb.RegisterGameServer(s.GrpcServer, s)
+	reflection.Register(s.GrpcServer) //在给定的gRPC服务器上注册服务器反射服务
  
 	// Serve方法在lis上接受传入连接，为每个连接创建一个ServerTransport和server的goroutine。
 	// 该goroutine读取gRPC请求，然后调用已注册的处理程序来响应它们。
 	utils.Sugar.Debugf("Start GameServer listening on %d", conf.GlobalConf.GameConf.Port)
-	return gs.Serve(lis)
+	return s.GrpcServer.Serve(lis)
 }
  
 func (s *GameServer)Stop()  {
-	s.BasicServer.Close()
+	s.BasicServer.Stop()
 }
 \ No newline at end of file
 package main
  
 import (
+	"os"
+	"os/signal"
 	"pro2d/actions"
 	"pro2d/utils"
+	"syscall"
 )
  
 func main() {
 	err := make(chan error)
+	stopChan := make(chan os.Signal)
+	signal.Notify(stopChan, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
+
 	server := actions.NewAccountServer()
 	go func() {
-		defer server.Stop()
 		err <- server.Start()
 	}()
  
-	utils.Sugar.Errorf("server error: %v", <- err)
+
+	select {
+	case e := <- err:
+		utils.Sugar.Errorf("game server error: %v", e)
+	case <-stopChan:
+		// 平滑关闭服务
+		server.Stop()
+	}
 }
 package main
  
 import (
+	"os"
+	"os/signal"
 	"pro2d/actions"
 	"pro2d/utils"
+	"syscall"
 )
  
 func main() {
 	err := make(chan error)
-
+	stopChan := make(chan os.Signal)
+	signal.Notify(stopChan, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
  
 	server := actions.NewGameServer()
 	go func() {
-		defer server.Stop()
 		err <- server.Start()
 	}()
  
-	utils.Sugar.Errorf("server error: %v", <- err)
+
+	select {
+	case e := <- err:
+		utils.Sugar.Errorf("game server error: %v", e)
+	case <-stopChan:
+		// 平滑关闭服务
+		server.Stop()
+	}
 }
@@ -9,7 +9,6 @@ import (
 	"go.mongodb.org/mongo-driver/mongo/readpref"
 	"go.mongodb.org/mongo-driver/x/bsonx"
 	"pro2d/utils"
-	"reflect"
 	"sort"
 	"strconv"
 	"time"
@@ -96,8 +95,7 @@ func NewMongoColl(key string, schema interface{}) *MgoColl {
 }
  
 func FindOne(pri interface{}, schema interface{}) error {
-	s := reflect.TypeOf(schema)
-	r := MongoDatabase.Collection(s.Name()).FindOne(context.TODO(), pri)
+	r := MongoDatabase.Collection(utils.GetCollName(schema)).FindOne(context.TODO(), pri)
 	return r.Decode(schema)
 }
  
@@ -17,6 +17,7 @@ func NewEtcdClient(conf *conf.Etcd) *EtcdClient {
 	cli, err := clientv3.New(clientv3.Config{
 		Endpoints:   conf.Endpoints,
 		DialTimeout:  time.Duration(conf.DialTimeout) * time.Second,
+		Logger: utils.Logger,
 	})
 	if err != nil {
 		utils.Sugar.Errorf("etcd init err: %v", err)
@@ -49,25 +50,25 @@ func (e *EtcdClient)PutWithLeasePrefix(prefix, key, val string, ttl int64) error
 		return err
 	}
  
-	_, err = lease.KeepAlive(context.TODO(), leaseResp.ID)
+	keepRespChan, err := lease.KeepAlive(context.TODO(), leaseResp.ID)
 	if err != nil {
 		utils.Sugar.Errorf("keepalive err: %v", err)
 		return err
 	}
-	//go func() {
-	//	for {
-	//		select {
-	//		case keepResp := <-keepRespChan:
-	//			if keepRespChan == nil {
-	//				fmt.Println("租约已经失效")
-	//				goto END
-	//			} else { //每秒会续租一次，所以就会受到一次应答
-	//				fmt.Println("收到自动续租应答:", keepResp.ID)
-	//			}
-	//		}
-	//	}
-	//	END:
-	//}()
+	go func() {
+		for {
+			select {
+			case _ = <-keepRespChan:
+				if keepRespChan == nil {
+					fmt.Println("租约已经失效")
+					goto END
+				} else { //每秒会续租一次，所以就会受到一次应答
+					//fmt.Println("收到自动续租应答:", keepResp.ID)
+				}
+			}
+		}
+		END:
+	}()
 	return nil
 }
  
@@ -99,4 +100,8 @@ func (e *EtcdClient)GetByPrefix(prefix string) map[string]string {
 		m[string(v.Key)] = string(v.Value)
 	}
 	return m
+}
+
+func (e *EtcdClient)Close()  {
+	e.etcd.Close()
 }
 \ No newline at end of file
@@ -22,9 +22,11 @@ func RoleExistByUid(uid string) (bool, *RoleModel){
 	if err := db.FindOne(db.GetBsonM("uid", uid), data); err != nil {
 		return false, nil
 	}
-	m := NewRole(data.Id)
-	m.Load()
-	return true, m
+
+	return true, &RoleModel{
+		MgoColl: db.NewMongoColl(strconv.Itoa(int(data.Id)), data),
+		Role: data,
+	}
 }
  
 func NewRole(id int64) *RoleModel {
-Subproject commit 3df1fd713f54812f465bbc704c6677aec3ccbe92
+Subproject commit a01eb6ede9a8e3f9d5ec30bf41e9f6e0f4f9ee1f
@@ -35,6 +35,7 @@ func Login(loginUri, token string)  {
 	defer gameConn.Close()
  
 	client:= pb.NewGameClient(gameConn)
+	var role *pb.Role
 	loginRsp, err := client.LoginHandler(context.Background(), &pb.Token{
 		Token: token,
 	})
@@ -43,17 +44,20 @@ func Login(loginUri, token string)  {
 		utils.Sugar.Errorf("login error: %v", err)
 		return
 	}
+	role = loginRsp.Role
  
-	print(loginRsp)
-
-	createRole, err := client.CreateRoleHandler(context.Background(), &pb.Token{Token: token})
-	if err != nil {
-		utils.Sugar.Errorf("create role err: %v", err)
-		return
+	if loginRsp.Rsp.Code != 0 {
+		utils.Sugar.Debugf("login rsp: %v", loginRsp.Rsp.Msg)
+		createRole, err := client.CreateRoleHandler(context.Background(), &pb.Token{Token: token})
+		if err != nil {
+			utils.Sugar.Errorf("create role err: %v", err)
+			return
+		}
+		utils.Sugar.Debug("create role rsp: ", createRole.Rsp.Code, createRole.Rsp.Msg)
+		role = createRole.Role
 	}
-	print(createRole)
  
-	utils.Sugar.Debug("login rsp: ", createRole.Rsp.Code, createRole.Rsp.Msg)
+	utils.Sugar.Debugf("login successful role: %v", role)
 }
  
 func main() {
@@ -64,11 +68,11 @@ func main() {
 	}
 	defer conn.Close()
 	c := pb.NewAccountClient(conn)
-	err = Register(c,"17683852936", "123456")
-	if err != nil {
-		utils.Sugar.Errorf("register err: %v", err)
-		return
-	}
+	//err = Register(c,"17683852936", "123456")
+	//if err != nil {
+	//	utils.Sugar.Errorf("register err: %v", err)
+	//	return
+	//}
 	rsp, err := c.CreateTokenHandler(context.Background(), &pb.AccountInfo{
 		Phone:                "17683852936",
 		Password:             "123456",
@@ -84,7 +88,7 @@ func main() {
 		return
 	}
  
-	Login(rsp.GameService.Address, rsp.Token)
-
-
+	if len(rsp.GameService) >0 {
+		Login(rsp.GameService[0].Address, rsp.Token)
+	}
 }
@@ -5,20 +5,21 @@ import (
 	"strings"
 )
  
-func GetCollName(schema interface{}) string {
+func GetSchemaType(schema interface{}) reflect.Type  {
 	s := reflect.TypeOf(schema)
 	if s.Kind() == reflect.Ptr {
 		s = reflect.TypeOf(schema).Elem()
 	}
+	return s
+}
  
-	return strings.ToLower(s.Name())
+func GetCollName(schema interface{}) string {
+	return strings.ToLower(GetSchemaType(schema).Name())
 }
  
 func GetPriKey(schema interface{}) string {
-	s := reflect.TypeOf(schema)
-	if s.Kind() == reflect.Ptr {
-		s = reflect.TypeOf(schema).Elem()
-	}
+	s := GetSchemaType(schema)
+
 	var pri string
 	for i := 0; i < s.NumField(); i++ {
 		if s.Field(i).Tag.Get("pri") == "1" {
@@ -30,10 +31,7 @@ func GetPriKey(schema interface{}) string {
 }
  
 func FindIndex(schema interface{}) (string, []string){
-	s := reflect.TypeOf(schema)
-	if s.Kind() == reflect.Ptr {
-		s = reflect.TypeOf(schema).Elem()
-	}
+	s := GetSchemaType(schema)
  
 	var index []string
 	for i := 0; i < s.NumField(); i++ {