Skip to content

Commit f3bf31c

Browse files
author
chenjie
committed
Merge branch 'main' of github.com:chenjie199234/Corelib into main
2 parents 63d8408 + 4035b0a commit f3bf31c

File tree

20 files changed

+140
-179
lines changed

20 files changed

+140
-179
lines changed

‎Corelib.drawio

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<mxfile host="app.diagrams.net" modified="2021-09-14T09:29:20.040Z" agent="5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Safari/605.1.15" etag="TVbzuPvnevfiUfoiCwUK" version="15.2.5" type="device"><diagram id="RstGZAmnf74Fe7RSCdtQ" name="Page-1">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</diagram></mxfile>
1+
<mxfile host="app.diagrams.net" modified="2021-09-20T06:38:15.924Z" agent="5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/93.0.4577.82 Safari/537.36 Edg/93.0.961.52" etag="7QVNOE04Bo1yD0Kc3uU-" version="15.2.9" type="device"><diagram id="RstGZAmnf74Fe7RSCdtQ" name="Page-1">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</diagram></mxfile>

‎Corelib.jpg

6.33 KB
Loading

‎codegen/tml/config/template_config.go

+1
Original file line numberDiff line numberDiff line change
@@ -611,6 +611,7 @@ func initsource(path string) {
611611
continue
612612
}
613613
tempredis := redis.NewRedis(&redis.Config{
614+
RedisName: k,
614615
Username: redisc.Username,
615616
Password: redisc.Passwd,
616617
Addr: redisc.Addr,

‎codegen/tml/ecode/ecode.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@ import (
1313
)
1414
1515
var (
16-
ErrUnknown = cerror.ErrUnknown //10000
17-
ErrReq = cerror.ErrReq //10001
18-
ErrResp = cerror.ErrResp //10002
19-
ErrSystem = cerror.ErrSystem //10003
20-
ErrAuth = cerror.ErrAuth //10004
21-
ErrLimit = cerror.ErrLimit //10005
22-
ErrBan = cerror.ErrBan //10006
16+
ErrUnknown = cerror.ErrUnknown //10000
17+
ErrReq = cerror.ErrReq //10001
18+
ErrResp = cerror.ErrResp //10002
19+
ErrSystem = cerror.ErrSystem //10003
20+
ErrAuth = cerror.ErrAuth //10004
21+
ErrLimit = cerror.ErrLimit //10005
22+
ErrBan = cerror.ErrBan //10006
23+
ErrNotExist = cerror.ErrNotExist //10007
2324
2425
ErrBusiness1 = cerror.MakeError(20001, "business error 1")
2526
)`

‎error/const.go

+8-7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
package error
22

33
var (
4-
ErrUnknown = &Error{Code: 10000, Msg: "unknown"}
5-
ErrReq = &Error{Code: 10001, Msg: "request error"}
6-
ErrResp = &Error{Code: 10002, Msg: "response error"}
7-
ErrSystem = &Error{Code: 10003, Msg: "system error"}
8-
ErrAuth = &Error{Code: 10004, Msg: "auth error"}
9-
ErrLimit = &Error{Code: 10005, Msg: "limit"}
10-
ErrBan = &Error{Code: 10006, Msg: "ban"}
4+
ErrUnknown = &Error{Code: 10000, Msg: "unknown"}
5+
ErrReq = &Error{Code: 10001, Msg: "request error"}
6+
ErrResp = &Error{Code: 10002, Msg: "response error"}
7+
ErrSystem = &Error{Code: 10003, Msg: "system error"}
8+
ErrAuth = &Error{Code: 10004, Msg: "auth error"}
9+
ErrLimit = &Error{Code: 10005, Msg: "limit"}
10+
ErrBan = &Error{Code: 10006, Msg: "ban"}
11+
ErrNotExist = &Error{Code: 10007, Msg: "not exist"}
1112
)

‎error/error.go

+4-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,8 @@ func ErrorstrToError(e string) *Error {
7070
}
7171
result := &Error{}
7272
if ee := json.Unmarshal(common.Str2byte(e), result); ee != nil {
73-
return &Error{Code: -1, Msg: e}
73+
result.Code = -1
74+
result.Msg = e
7475
}
7576
return result
7677
}
@@ -84,7 +85,8 @@ func StdErrorToError(e error) *Error {
8485
}
8586
result = &Error{}
8687
if ee := json.Unmarshal(common.Str2byte(e.Error()), result); ee != nil {
87-
return &Error{Code: -1, Msg: e.Error()}
88+
result.Code = -1
89+
result.Msg = e.Error()
8890
}
8991
return result
9092
}

‎log/log.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ func write(ctx context.Context, buf *bufpool.Buffer, datas ...interface{}) {
102102
buf.Append(file)
103103
buf.Append(":")
104104
buf.Append(line)
105-
traceid, _, _, _, _, _ := trace.GetTrace(ctx)
105+
traceid, _, _, _, _ := trace.GetTrace(ctx)
106106
if traceid != "" {
107107
buf.Append(" ")
108108
buf.Append("Traceid: ")

‎redis/listmq.go

+1-2
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,8 @@ func (p *Pool) ListMQSub(name string, num uint64, recvbufnum uint64, stop chan s
129129
return recv, nil
130130
}
131131

132-
const pub = `if(redis.call("EXISTS",KEYS[2])~=0)
132+
const pub = `if(redis.call("EXISTS",KEYS[2])~=0 and redis.call("EXPIRE",KEYS[1],11)~=0)
133133
then
134-
redis.call("EXPIRE",KEYS[1],11)
135134
for i=1,#ARGV,1 do
136135
redis.call("rpush",KEYS[1],ARGV[i])
137136
end

‎redis/redis.go

+16-21
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,25 @@ package redis
22

33
import (
44
"context"
5-
"sync"
65
"time"
76

7+
"github.com/chenjie199234/Corelib/trace"
8+
89
"github.com/gomodule/redigo/redis"
910
)
1011

1112
type Pool struct {
13+
c *Config
1214
p *redis.Pool
1315
}
1416

1517
type Conn struct {
16-
c redis.Conn
18+
c redis.Conn
19+
traceend func(error)
1720
}
1821

1922
type Config struct {
23+
RedisName string
2024
Username string
2125
Password string
2226
Addr string
@@ -29,11 +33,6 @@ type Config struct {
2933
var ErrNil = redis.ErrNil
3034
var ErrPoolExhausted = redis.ErrPoolExhausted
3135

32-
var p *sync.Pool
33-
34-
func init() {
35-
p = &sync.Pool{}
36-
}
3736
func NewRedis(c *Config) *Pool {
3837
return &Pool{
3938
p: &redis.Pool{
@@ -59,18 +58,7 @@ func NewRedis(c *Config) *Pool {
5958
},
6059
}
6160
}
62-
func getconn(conn redis.Conn) *Conn {
63-
c, ok := p.Get().(*Conn)
64-
if !ok {
65-
return &Conn{c: conn}
66-
}
67-
c.c = conn
68-
return c
69-
}
70-
func putconn(c *Conn) {
71-
c.c.Close()
72-
p.Put(c)
73-
}
61+
7462
func (p *Pool) GetRedis() *redis.Pool {
7563
return p.p
7664
}
@@ -79,7 +67,8 @@ func (p *Pool) GetContext(ctx context.Context) (*Conn, error) {
7967
if e != nil {
8068
return nil, e
8169
}
82-
return getconn(c), nil
70+
traceend := trace.TraceStart(ctx, trace.CLIENT, p.c.RedisName, p.c.Addr, "REDIS", "unknown")
71+
return &Conn{c: c, traceend: traceend}, nil
8372
}
8473
func (p *Pool) Ping(ctx context.Context) error {
8574
c, e := p.GetContext(ctx)
@@ -123,8 +112,14 @@ func (c *Conn) ReceiveContext(ctx context.Context) (interface{}, error) {
123112
return c.c.Receive()
124113
}
125114
}
115+
func (c *Conn) Err() error {
116+
return c.c.Err()
117+
}
126118
func (c *Conn) Close() {
127-
putconn(c)
119+
if c.traceend != nil {
120+
c.traceend(c.c.Err())
121+
}
122+
c.c.Close()
128123
}
129124
func Int(reply interface{}, e error) (int, error) {
130125
return redis.Int(reply, e)

‎rpc/client.go

+5-6
Original file line numberDiff line numberDiff line change
@@ -490,13 +490,12 @@ func (c *RpcClient) Call(ctx context.Context, functimeout time.Duration, path st
490490
Body: in,
491491
Metadata: metadata,
492492
}
493-
traceid, _, _, frommethod, frompath, fromkind := trace.GetTrace(ctx)
493+
traceid, _, _, selfmethod, selfpath := trace.GetTrace(ctx)
494494
if traceid != "" {
495495
msg.Tracedata = map[string]string{
496-
"Traceid": traceid,
497-
"Method": frommethod,
498-
"Path": frompath,
499-
"Kind": string(fromkind),
496+
"Traceid": traceid,
497+
"SourceMethod": selfmethod,
498+
"SourcePath": selfpath,
500499
}
501500
}
502501
d, _ := proto.Marshal(msg)
@@ -554,7 +553,7 @@ func (c *RpcClient) Call(ctx context.Context, functimeout time.Duration, path st
554553
server.lker.Unlock()
555554
continue
556555
}
557-
traceend := trace.TraceStart(ctx, trace.CLIENT, c.appname, server.addr, "RPC", path, trace.RPC)
556+
traceend := trace.TraceStart(ctx, trace.CLIENT, c.appname, server.addr, "RPC", path)
558557
//send message success,store req,add req num
559558
server.reqs[msg.Callid] = r
560559
atomic.AddInt32(&server.Pickinfo.Activecalls, 1)

‎rpc/context.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ func (c *Context) WriteString(resp string) {
5555
func (c *Context) GetBody() []byte {
5656
return c.msg.Body
5757
}
58-
func (c *Context) GetSourceServer() string {
58+
func (c *Context) GetSourceApp() string {
5959
return c.peeruniquename
6060
}
6161
func (c *Context) GetPath() string {

‎rpc/protoc-gen-go-rpc/test/test.proto

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ service test {
77
rpc hello(helloreq)returns(helloresp){
88
option (pbex.method)="post";
99
option (pbex.timeout)="200ms";
10-
option (pbex.midwares)="user";
11-
option (pbex.midwares)="limit";
10+
option (pbex.rpc_midwares)="user";
11+
option (pbex.rpc_midwares)="limit";
1212
}
1313
}
1414
enum TestEnum {

‎rpc/server.go

+16-20
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ func (s *RpcServer) insidehandler(path string, functimeout time.Duration, handle
284284
msg.Path = ""
285285
msg.Deadline = 0
286286
msg.Body = nil
287-
msg.Error = context.DeadlineExceeded.Error()
287+
msg.Error = cerror.StdErrorToError(context.DeadlineExceeded).Error()
288288
msg.Metadata = nil
289289
msg.Tracedata = nil
290290
return
@@ -361,12 +361,13 @@ func (s *RpcServer) userfunc(p *stream.Peer, peeruniquename string, data []byte,
361361
if msg.Tracedata != nil {
362362
traceid = msg.Tracedata["Traceid"]
363363
}
364-
ctx := trace.InitTrace(nil, traceid, s.instance.GetSelfName(), host.Hostip, "rpc", msg.Path, trace.RPC)
364+
ctx := trace.InitTrace(nil, traceid, s.instance.GetSelfName(), host.Hostip, "RPC", msg.Path)
365365
//if traceid is not empty,traceid will not change
366366
//if traceid is empty,init trace will create a new traceid,use the new traceid
367-
traceid, _, _, _, _, _ = trace.GetTrace(ctx)
367+
traceid, _, _, _, _ = trace.GetTrace(ctx)
368368
handler, ok := s.handler[msg.Path]
369369
if !ok {
370+
log.Error(ctx, "[rpc.server.userfunc] client:", peeruniquename, "call path:", msg.Path, "error: unknown path")
370371
msg.Path = ""
371372
msg.Deadline = 0
372373
msg.Body = nil
@@ -407,28 +408,23 @@ func (s *RpcServer) userfunc(p *stream.Peer, peeruniquename string, data []byte,
407408
}
408409
}
409410
go func() {
410-
var fromapp, fromip, frommethod, frompath string
411-
var fromkind trace.KIND
411+
var sourceapp, sourceip, sourcemethod, sourcepath string
412412
if msg.Tracedata != nil {
413-
frommethod = msg.Tracedata["Method"]
414-
frompath = msg.Tracedata["Path"]
415-
fromkind = trace.KIND(msg.Tracedata["Kind"])
413+
sourcemethod = msg.Tracedata["SourceMethod"]
414+
sourcepath = msg.Tracedata["SourcePath"]
416415
}
417-
fromapp = peeruniquename[:strings.Index(peeruniquename, ":")]
418-
if fromapp == "" {
419-
fromapp = "unkown"
416+
sourceapp = peeruniquename[:strings.Index(peeruniquename, ":")]
417+
if sourceapp == "" {
418+
sourceapp = "unkown"
420419
}
421-
fromip = peeruniquename[strings.Index(peeruniquename, ":")+1 : strings.LastIndex(peeruniquename, ":")]
422-
if frommethod == "" {
423-
frommethod = "unknown"
420+
sourceip = peeruniquename[strings.Index(peeruniquename, ":")+1:]
421+
if sourcemethod == "" {
422+
sourcemethod = "unknown"
424423
}
425-
if frompath == "" {
426-
frompath = "unknown"
424+
if sourcepath == "" {
425+
sourcepath = "unknown"
427426
}
428-
if fromkind == "" {
429-
fromkind = trace.KIND("unknown")
430-
}
431-
traceend := trace.TraceStart(trace.InitTrace(nil, traceid, fromapp, fromip, frommethod, frompath, fromkind), trace.SERVER, s.instance.GetSelfName(), host.Hostip, "RPC", msg.Path, trace.RPC)
427+
traceend := trace.TraceStart(trace.InitTrace(nil, traceid, sourceapp, sourceip, sourcemethod, sourcepath), trace.SERVER, s.instance.GetSelfName(), host.Hostip, "RPC", msg.Path)
432428
//logic
433429
handler(ctx, peeruniquename, msg)
434430
traceend(cerror.ErrorstrToError(msg.Error))

0 commit comments

Comments
 (0)