fix: roleID自增加上限制。etcd变成全局方法。

zhangqijia
1 parent 101d1cc1
Showing 11 changed files with 67 additions and 28 deletions Show diff stats
cmd/gameserver/action/RoleAction_test.go
cmd/gameserver/main.go
cmd/gameserver/service/game.go
cmd/httpserver/AccountAction.go
cmd/httpserver/http.go
common/commonFunc.go
common/components/http.go
common/conf.go
common/const.go
common/etcd/etcd.go
common/etcd/etcd_test.go
@@ -12,7 +12,7 @@ import (
 func TestGetActionMap(t *testing.T) {
 	rand.Seed(common.Timex())
-	var redisConf  = common.GlobalConf.GameConf.RedisConf
+	var redisConf = common.GlobalSconf.RedisConf
 	if err := redisproxy.ConnectRedis(redisConf.DB, redisConf.Auth, redisConf.Address); err != nil {
 		logger.Error(err)
 		return
@@ -19,17 +19,17 @@ func main() {
 	userChan := make(chan os.Signal)
 	signal.Notify(userChan, syscall.SIGUSR1, syscall.SIGUSR2)
-	sconf := common.GlobalConf.GameConf
-	s, err1 := service.NewGameServer(sconf)
+	common.GlobalSconf = common.GlobalConf.GameConf
+	s, err1 := service.NewGameServer()
 	if err1 != nil {
 		logger.Error(err1)
 		return
 	}
 	go func() {
-		err <- http.ListenAndServe(fmt.Sprintf("localhost:%d", sconf.DebugPort), nil)
+		err <- http.ListenAndServe(fmt.Sprintf("localhost:%d", common.GlobalSconf.DebugPort), nil)
 	}()
-	gm := service.NewGmServer(s, fmt.Sprintf(":%d", sconf.GMPort))
+	gm := service.NewGmServer(s, fmt.Sprintf(":%d", common.GlobalSconf.GMPort))
 	go func() {
 		err <- gm.Start()
 	}()
@@ -18,10 +18,10 @@ import (
 type GameServer struct {
 	components.IServer
-	EtcdClient *etcd.EtcdClient
 }
-func NewGameServer(sconf *common.SConf) (*GameServer, error) {
+func NewGameServer() (*GameServer, error) {
+	sconf := common.GlobalSconf
 	s := &GameServer{}
 	options := []components.ServerOption{
@@ -40,6 +40,7 @@ func NewGameServer(sconf *common.SConf) (*GameServer, error) {
 		options = append(options, components.WithSplitter(components.NewPBSplitter(nil)))
 	}
+	//设置逻辑处理的handler
 	iserver := components.NewServer(sconf.Port, options...)
 	iserver.SetActions(action.GetActionMap())
 	s.IServer = iserver
@@ -56,11 +57,11 @@ func NewGameServer(sconf *common.SConf) (*GameServer, error) {
 	}
 	//Etcd 初始化
-	s.EtcdClient, err = etcd.NewEtcdClient(common.GlobalConf.Etcd)
+	err = etcd.NewEtcdClient(common.GlobalConf.Etcd)
 	if err != nil {
 		return nil, err
 	}
-	s.EtcdClient.PutWithLeasePrefix(common.GlobalConf.GameConf.Name, fmt.Sprintf("%d", common.GlobalConf.GameConf.ID), fmt.Sprintf("%s:%d", common.GlobalConf.GameConf.IP, common.GlobalConf.GameConf.Port), 5)
+	etcd.PutWithLeasePrefix(sconf.Name, fmt.Sprintf("%d", sconf.ID), fmt.Sprintf("%s:%d", sconf.IP, sconf.Port), 5)
 	//设置服务器ID & game
 	models.NewDBSeed(sconf.ID).InitServerDatabase(models.GameModels())
@@ -91,7 +92,7 @@ func (s *GameServer) Stop() {
 	mongoproxy.CloseMongo()
 	redisproxy.CloseRedis()
-	s.EtcdClient.Close()
+	etcd.CloseEtcd()
 }
 func (s *GameServer) OnConnection(conn components.IConnection) {
@@ -5,6 +5,7 @@ import (
 	"github.com/gin-gonic/gin"
 	"pro2d/common"
 	"pro2d/common/db/redisproxy"
+	"pro2d/common/etcd"
 	"pro2d/common/sms"
 	"pro2d/models"
 	"pro2d/pb"
@@ -65,7 +66,7 @@ func (h *AccountAction) Login(c *gin.Context) (int, interface{}) {
 	}
 	var gs []*pb.ServiceInfo
-	for k, v := range h.HttpServer.EtcdClient.GetByPrefix(common.GlobalConf.GameConf.Name) {
+	for k, v := range etcd.GEtcdClient().GetByPrefix(common.GlobalSconf.Name) {
 		gs = append(gs, &pb.ServiceInfo{
 			Id:      k,
 			Name:    common.GlobalConf.GameConf.Name,
@@ -17,8 +17,7 @@ import (
 type AccountServer struct {
 	components.IHttp
-	EtcdClient *etcd.EtcdClient
-	Sconf      *common.SConf
+	Sconf *common.SConf
 }
 func NewAccountServer(version string, port ...string) *AccountServer {
@@ -37,14 +36,14 @@ func (s *AccountServer) Init(sconf *common.SConf) error {
 	}
 	//Etcd 初始化
-	s.EtcdClient, err = etcd.NewEtcdClient(common.GlobalConf.Etcd)
+	err = etcd.NewEtcdClient(common.GlobalConf.Etcd)
 	if err != nil {
 		return err
 	}
+	etcd.PutWithLeasePrefix(sconf.Name, fmt.Sprintf("%d", sconf.ID), fmt.Sprintf("%s:%d", sconf.IP, sconf.Port), 5)
+
 	models.NewDBSeed(sconf.ID).InitServerDatabase(models.AccountModels())
 	models.DBSeedS().InitAutoIncreUidTable(models.AccountModels())
-
-	s.EtcdClient.PutWithLeasePrefix(sconf.Name, fmt.Sprintf("%d", sconf.ID), fmt.Sprintf("%s:%d", sconf.IP, sconf.Port), 5)
 	return nil
 }
@@ -65,12 +64,19 @@ func (s *AccountServer) Start() error {
 	return s.IHttp.Start()
 }
+func (s *AccountServer) Stop() {
+	s.IHttp.Stop()
+	etcd.CloseEtcd()
+}
+
 func main() {
 	err := make(chan error)
 	stopChan := make(chan os.Signal)
 	signal.Notify(stopChan, syscall.SIGTERM, syscall.SIGINT, syscall.SIGKILL)
-	web := NewAccountServer("v1", fmt.Sprintf(":%d", common.GlobalConf.AccountConf.Port))
+	common.GlobalSconf = common.GlobalConf.AccountConf
+
+	web := NewAccountServer("v1", fmt.Sprintf(":%d", common.GlobalSconf.Port))
 	web.BindHandler(&AccountAction{HttpServer: web})
 	go func() {
 		err <- web.Start()
 package common
 import (
+	"errors"
 	"fmt"
 	"github.com/garyburd/redigo/redis"
 	"pro2d/common/db/redisproxy"
@@ -11,9 +12,18 @@ func GetNextRoleId() (string, error) {
 	if err != nil {
 		return "", err
 	}
+	ID, err := redis.Int64(relay, err)
+	if err != nil {
+		return "", err
+	}
+
+	//roleID的范围 [GlobalSconf.ID*MaxRoleNum, GlobalSconf.ID*MaxRoleNum + MaxRoleNum]
+	if ID-GlobalSconf.ID*MaxRoleNum >= MaxCommNum-1 {
+		return "", errors.New("DB_FULL")
+	}
 	relay, err = redisproxy.HINCRBY(AutoIncrement, "role", 1)
-	ID, err := redis.Int64(relay, err)
+	ID, err = redis.Int64(relay, err)
 	if err != nil {
 		return "", err
 	}
@@ -74,3 +74,6 @@ func (h *HttpServer) Start() error {
 	}
 	return r.Run(h.port...) // listen and serve on 0.0.0.0:8080 (for windows "localhost:8080")
 }
+
+func (h *HttpServer) Stop() {
+}
@@ -94,8 +94,9 @@ type ServerConf struct {
 }
 var (
-	GlobalConf ServerConf
-	SnowFlack  *snow.Snowflake
+	GlobalConf  ServerConf
+	GlobalSconf *SConf
+	SnowFlack   *snow.Snowflake
 )
 func init() {
@@ -14,6 +14,7 @@ const (
 	//自增id相关
 	MaxCommNum = 1000000
+	MaxRoleNum = MaxCommNum
 	MaxUidNum  = 90000
 	AutoIncrement     = "pro2d_autoincrement_set"
@@ -14,19 +14,27 @@ type EtcdClient struct {
 	lease clientv3.Lease
 }
-func NewEtcdClient(conf *common.Etcd) (*EtcdClient, error) {
+var GlobalEtcd *EtcdClient
+
+func NewEtcdClient(conf *common.Etcd) error {
 	cli, err := clientv3.New(clientv3.Config{
 		Endpoints:   conf.Endpoints,
 		DialTimeout: time.Duration(conf.DialTimeout) * time.Second,
 	})
 	if err != nil {
 		logger.Error("etcd init err: %v", err)
-		return nil, err
+		return err
 	}
-	return &EtcdClient{
+
+	GlobalEtcd = &EtcdClient{
 		etcd:  cli,
 		lease: clientv3.NewLease(cli),
-	}, nil
+	}
+	return nil
+}
+
+func GEtcdClient() *EtcdClient {
+	return GlobalEtcd
 }
 func (e *EtcdClient) PutWithPrefix(prefix, key, val string) {
@@ -131,3 +139,11 @@ func (e *EtcdClient) GetByPrefix(prefix string) map[string]string {
 func (e *EtcdClient) Close() {
 	e.etcd.Close()
 }
+
+func PutWithLeasePrefix(prefix, key, val string, ttl int64) error {
+	return GEtcdClient().PutWithLeasePrefix(prefix, key, val, ttl)
+}
+
+func CloseEtcd() {
+	GEtcdClient().Close()
+}
@@ -11,17 +11,17 @@ import (
 )
 func TestEtcdClient_GetByPrefix(t *testing.T) {
-	etcd, err := NewEtcdClient(common.GlobalConf.Etcd)
+	err := NewEtcdClient(common.GlobalConf.Etcd)
 	if err != nil {
 		logger.Error(err)
 		return
 	}
-	gameInfo := etcd.GetByPrefix(common.GlobalConf.AccountConf.Name)
+	gameInfo := GEtcdClient().GetByPrefix(common.GlobalConf.AccountConf.Name)
 	for k, v := range gameInfo {
 		logger.Debug("game info key:  %v val: %v", k, v)
 	}
-	rch := etcd.etcd.Watch(context.Background(), fmt.Sprintf("/%s/", common.GlobalConf.AccountConf.Name), clientv3.WithPrefix())
+	rch := GEtcdClient().etcd.Watch(context.Background(), fmt.Sprintf("/%s/", common.GlobalConf.AccountConf.Name), clientv3.WithPrefix())
 	go func() {
 		for wresp := range rch {
 			for _, ev := range wresp.Events {
@@ -35,7 +35,7 @@ func TestEtcdClient_GetByPrefix(t *testing.T) {
 		}
 	}()
-	game := etcd.etcd.Watch(context.Background(), fmt.Sprintf("/%s/", common.GlobalConf.GameConf.Name), clientv3.WithPrefix())
+	game := GEtcdClient().etcd.Watch(context.Background(), fmt.Sprintf("/%s/", common.GlobalConf.GameConf.Name), clientv3.WithPrefix())
 	for wresp := range game {
 		for _, ev := range wresp.Events {
 			switch ev.Type {