del test plugin

zhangqijia
1 parent bca0b6f9
Showing 8 changed files with 24 additions and 52 deletions Show diff stats
Makefile
plugin/plugin.go
plugin/plumain.go
src/actions/HttpAction.go
src/components/etcd/etcd.go
src/components/etcd/etcd_test.go
src/components/net/server.go
src/plugin/RolePlugin.go
@@ -17,6 +17,9 @@ build:
 	go build -o bin/account cmd/http.go
 	go build -o bin/game cmd/game.go
 	go build -o bin/test test/client.go
+regame:plugin
+	lsof -i:8849 | grep "game" | grep -v grep | awk '{print $$2}'  | xargs -I {} kill -USR1 {}
+
 plugin:
 	#go build -ldflags -pluginpath="plugin/hot-1" --buildmode=plugin -o bin/plugin.so src/plugin/*.go
 	go build --buildmode=plugin -o bin/$(pname) src/plugin/*.go
@@ -1,11 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"pro2d/src/components/net"
-)
-
-func IamPluginA(pkg net.MsgPkg) {
-	fmt.Println("Hello, I am PluginB!")
-	fmt.Println(pkg.Head.Length)
-}
@@ -1,32 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"plugin"
-	"pro2d/src/components/net"
-)
-
-func main() {
-	p, err := plugin.Open("./bin/plugin.so")
-	if err != nil {
-		fmt.Println("error open plugin: ", err)
-		os.Exit(-1)
-	}
-	s, err := p.Lookup("IamPluginA")
-	if err != nil {
-		fmt.Println("error lookup IamPluginA: ", err)
-		os.Exit(-1)
-	}
-	pkg1 := net.MsgPkg{
-		Head: &net.Head{
-			Length:   16,
-			Cmd:      0,
-			ErrCode:  0,
-		},
-	}
-	if x, ok := s.(func(net.MsgPkg)); ok {
-		x(pkg1)
-	}
-
-}
@@ -106,7 +106,11 @@ func (h *HttpAction) Start() error {
 	models.InitAccountServerModels()
  
 	//Etcd 初始化
-	h.EtcdClient = etcd.NewEtcdClient(conf.GlobalConf.Etcd)
+	var err error
+	h.EtcdClient, err = etcd.NewEtcdClient(conf.GlobalConf.Etcd)
+	if err != nil {
+		return err
+	}
 	h.EtcdClient.PutWithLeasePrefix(conf.GlobalConf.AccountConf.Name, conf.GlobalConf.AccountConf.ID, fmt.Sprintf("%s:%d", conf.GlobalConf.AccountConf.IP, conf.GlobalConf.AccountConf.Port), 5)
  
 	//gin初始化
@@ -13,18 +13,18 @@ type EtcdClient struct {
 	etcd *clientv3.Client
 }
  
-func NewEtcdClient(conf *conf.Etcd) *EtcdClient {
+func NewEtcdClient(conf *conf.Etcd) (*EtcdClient, 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
+		return nil, err
 	}
 	return &EtcdClient{
 		etcd: cli,
-	}
+	}, nil
 }
  
 func (e *EtcdClient)PutWithPrefix(prefix, key, val string)  {
@@ -11,7 +11,11 @@ import (
 )
  
 func TestEtcdClient_GetByPrefix(t *testing.T) {
-	etcd := NewEtcdClient(conf.GlobalConf.Etcd)
+	etcd, err := NewEtcdClient(conf.GlobalConf.Etcd)
+	if err != nil {
+		logger.Error(err)
+		return
+	}
 	gameInfo := etcd.GetByPrefix(conf.GlobalConf.AccountConf.Name)
 	for k, v := range gameInfo {
 		logger.Debug("game info key:  %v val: %v", k, v)
@@ -85,7 +85,7 @@ func (s *Server) LoadPlugin() {
 	//重新加载
 	_, err:=plugin.Open(conf.GlobalConf.GameConf.PluginPath)
 	if err != nil {
-		logger.Error("load plugin err: %v", err)
+		logger.Error("load plugin err: %v, %s", err, conf.GlobalConf.GameConf.PluginPath)
 		return
 	}
 	logger.Debug("load plugin success")
@@ -97,11 +97,15 @@ func (s *Server)Start() error {
 	models.InitGameServerModels()
  
 	//Etcd 初始化
-	s.EtcdClient = etcd.NewEtcdClient(conf.GlobalConf.Etcd)
+	var err error
+	s.EtcdClient, err = etcd.NewEtcdClient(conf.GlobalConf.Etcd)
+	if err != nil {
+		return err
+	}
 	s.EtcdClient.PutWithLeasePrefix(conf.GlobalConf.GameConf.Name, conf.GlobalConf.GameConf.ID, fmt.Sprintf("%s:%d", conf.GlobalConf.GameConf.IP, conf.GlobalConf.GameConf.Port), 5)
  
 	//初始化plugin
-	_, err := plugin.Open(conf.GlobalConf.GameConf.PluginPath)
+	_, err = plugin.Open(conf.GlobalConf.GameConf.PluginPath)
 	if err != nil {
 		return err
 	}
@@ -34,7 +34,7 @@ func CreateRpc(msg *net.MsgPkg) (int32, proto.Message)   {
 }
  
 func  LoginRpc(msg *net.MsgPkg) (int32, proto.Message)  {
-	logger.Debug("cmd: %v, msg: %s", msg.Head.Cmd, msg.Body)
+	//logger.Debug("cmd: %v, msg: %s", msg.Head.Cmd, msg.Body)
 	req := pb.LoginReq{}
 	if err := proto.Unmarshal(msg.Body, &req); err != nil {
 		logger.Error("loginRpc err: %v", err)