update

Author: chenjie199234

cgrpc/context.go

@@ -10,7 +10,7 @@ import (
 func (s *CGrpcServer) getcontext(c context.Context, path string, peername string, peeraddr string, metadata map[string]string, handlers []OutsideHandler, d func(interface{}) error) *Context {
 	ctx, ok := s.ctxpool.Get().(*Context)
 	if !ok {
-		return &Context{
+		ctx = &Context{
 			Context:    c,
 			decodefunc: d,
 			handlers:   handlers,
@@ -22,20 +22,29 @@ func (s *CGrpcServer) getcontext(c context.Context, path string, peername string
 			e:          nil,
 			status:     0,
 		}
+		if metadata == nil {
+			ctx.metadata = make(map[string]string)
+		}
+		return ctx
 	}
 	ctx.Context = c
 	ctx.decodefunc = d
 	ctx.handlers = handlers
 	ctx.path = path
 	ctx.peername = peername
 	ctx.peeraddr = peeraddr
-	ctx.metadata = metadata
+	if metadata != nil {
+		ctx.metadata = metadata
+	}
 	ctx.resp = nil
 	ctx.e = nil
 	ctx.status = 0
 	return ctx
 }
 func (s *CGrpcServer) putcontext(ctx *Context) {
+	for k := range ctx.metadata {
+		delete(ctx.metadata, k)
+	}
 	s.ctxpool.Put(ctx)
 }
 

cgrpc/server.go

@@ -239,10 +239,11 @@ func (s *CGrpcServer) insidehandler(sname, mname string, handlers ...OutsideHand
 			}
 		}
 		traceid, _, _, _, _, selfdeep = trace.GetTrace(ctx)
-		mdata := make(map[string]string)
+		var mdata map[string]string
 		if ok {
 			data := grpcmetadata.Get("core_metadata")
 			if len(data) != 0 {
+				mdata = make(map[string]string)
 				if e := json.Unmarshal(common.Str2byte(data[0]), &mdata); e != nil {
 					log.Error(nil, "[cgrpc.server] client:", sourceapp+":"+sourceip, "path:", path, "method: GRPC metadata:", data[0], "format error:", e)
 					return nil, cerror.ErrReq

codegen/tml/gomod/template_gomod.go

@@ -11,8 +11,8 @@ const text = `module {{.}}
 go 1.17
 
 require (
-	github.com/chenjie199234/Config v0.0.28
-	github.com/chenjie199234/Corelib v0.0.42
+	github.com/chenjie199234/Config v0.0.29
+	github.com/chenjie199234/Corelib v0.0.43
 	github.com/fsnotify/fsnotify v1.5.1
 	github.com/go-sql-driver/mysql v1.6.0
 	github.com/segmentio/kafka-go v0.4.25

crpc/context.go

@@ -8,32 +8,44 @@ import (
 	"github.com/chenjie199234/Corelib/util/common"
 )
 
-func (s *CrpcServer) getContext(ctx context.Context, p *stream.Peer, msg *Msg, handlers []OutsideHandler) *Context {
-	result, ok := s.ctxpool.Get().(*Context)
+func (s *CrpcServer) getContext(c context.Context, p *stream.Peer, msg *Msg, handlers []OutsideHandler) *Context {
+	ctx, ok := s.ctxpool.Get().(*Context)
 	if !ok {
-		return &Context{
-			Context:  ctx,
+		ctx = &Context{
+			Context:  c,
 			peer:     p,
 			msg:      msg,
+			metadata: msg.Metadata,
 			handlers: handlers,
 			status:   0,
 		}
+		if msg.Metadata == nil {
+			ctx.metadata = make(map[string]string)
+		}
+		return ctx
+	}
+	ctx.Context = c
+	ctx.peer = p
+	ctx.msg = msg
+	if msg.Metadata != nil {
+		ctx.metadata = msg.Metadata
 	}
-	result.Context = ctx
-	result.peer = p
-	result.msg = msg
-	result.handlers = handlers
-	result.status = 0
-	return result
+	ctx.handlers = handlers
+	ctx.status = 0
+	return ctx
 }
 
 func (s *CrpcServer) putContext(ctx *Context) {
+	for k := range ctx.metadata {
+		delete(ctx.metadata, k)
+	}
 	s.ctxpool.Put(ctx)
 }
 
 type Context struct {
 	context.Context
 	msg      *Msg
+	metadata map[string]string
 	peer     *stream.Peer
 	handlers []OutsideHandler
 	status   int8
@@ -93,5 +105,5 @@ func (c *Context) GetPeerAddr() string {
 	return c.peer.GetRemoteAddr()
 }
 func (c *Context) GetMetadata() map[string]string {
-	return c.msg.Metadata
+	return c.metadata
 }

crpc/server.go

@@ -414,9 +414,6 @@ func (s *CrpcServer) userfunc(p *stream.Peer, data []byte) {
 	c.calls[msg.Callid] = cancel
 	c.Unlock()
 	go func() {
-		if msg.Metadata == nil {
-			msg.Metadata = make(map[string]string)
-		}
 		handler(ctx, p, msg)
 		d, _ := proto.Marshal(msg)
 		if e := p.SendMessage(ctx, d, nil, nil); e != nil {

web/context.go

@@ -15,7 +15,7 @@ import (
 func (s *WebServer) getContext(w http.ResponseWriter, r *http.Request, c context.Context, peername string, metadata map[string]string, handlers []OutsideHandler) *Context {
 	ctx, ok := s.ctxpool.Get().(*Context)
 	if !ok {
-		return &Context{
+		ctx = &Context{
 			Context:  c,
 			w:        w,
 			r:        r,
@@ -25,19 +25,28 @@ func (s *WebServer) getContext(w http.ResponseWriter, r *http.Request, c context
 			status:   0,
 			e:        nil,
 		}
+		if metadata == nil {
+			ctx.metadata = make(map[string]string)
+		}
+		return ctx
 	}
 	ctx.Context = c
 	ctx.w = w
 	ctx.r = r
 	ctx.peername = peername
-	ctx.metadata = metadata
+	if metadata != nil {
+		ctx.metadata = metadata
+	}
 	ctx.handlers = handlers
 	ctx.status = 0
 	ctx.e = nil
 	return ctx
 }
 
 func (s *WebServer) putContext(ctx *Context) {
+	for k := range ctx.metadata {
+		delete(ctx.metadata, k)
+	}
 	s.ctxpool.Put(ctx)
 }
 

web/server.go

@@ -513,8 +513,9 @@ func (s *WebServer) insideHandler(method, path string, handlers []OutsideHandler
 			sourcepath = tracedata[3]
 		}
 		traceid, _, _, _, _, selfdeep = trace.GetTrace(ctx)
-		mdata := make(map[string]string)
+		var mdata map[string]string
 		if mdstr := r.Header.Get("Core_metadata"); mdstr != "" {
+			mdata = make(map[string]string)
 			if e := json.Unmarshal(common.Str2byte(mdstr), &mdata); e != nil {
 				log.Error(ctx, "[web.server] client ip:", getclientip(r), "path:", path, "method:", method, "error: metadata:", mdstr, "format error")
 				w.WriteHeader(http.StatusBadRequest)