unistack-org/micro
4
0
Fork 2
Code Issues 18 Pull Requests Actions Packages Projects Releases 331 Wiki Activity

Merge pull request #7 from itzmanish/protoc-gen-micro-fix

Browse Source 
generate SendAndClose() and CloseAndRecv() on streams.
This commit was merged in pull request #7.
This commit is contained in:
Василий Толстов
2020-11-07 15:53:00 +03:00
committed by GitHub
parent be8d09c663 2141e9631c
commit bd6493327f
1 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
cmd/protoc-gen-micro/plugin/micro/micro.go
View File

@@ -378,6 +378,11 @@ func (g *micro) generateClientMethod(reqServ, servName, serviceDescVar string, m
g.P("Context() context.Context") g.P("Context() context.Context")
g.P("SendMsg(interface{}) error") g.P("SendMsg(interface{}) error")
g.P("RecvMsg(interface{}) error") g.P("RecvMsg(interface{}) error")
if genSend && !genRecv {
// client streaming, the server will send a response upon close
g.P("CloseAndRecv() (*", outType, ", error)")
}
g.P("Close() error") g.P("Close() error")
if genSend { if genSend {
@@ -394,6 +399,18 @@ func (g *micro) generateClientMethod(reqServ, servName, serviceDescVar string, m
g.P("}") g.P("}")
g.P() g.P()
if genSend && !genRecv {
// client streaming, the server will send a response upon close
g.P("func (x *", streamType, ") CloseAndRecv() (*", outType, ", error) {")
g.P("if err := x.stream.Close(); err != nil {")
g.P("return nil, err")
g.P("}")
g.P("r := new(", outType, ")")
g.P("err := x.RecvMsg(r)")
g.P("return r, err")
g.P("}")
g.P()
}
g.P("func (x *", streamType, ") Close() error {") g.P("func (x *", streamType, ") Close() error {")
g.P("return x.stream.Close()") g.P("return x.stream.Close()")
g.P("}") g.P("}")
@@ -493,6 +510,10 @@ func (g *micro) generateServerMethod(servName string, method *pb.MethodDescripto
g.P("Context() context.Context") g.P("Context() context.Context")
g.P("SendMsg(interface{}) error") g.P("SendMsg(interface{}) error")
g.P("RecvMsg(interface{}) error") g.P("RecvMsg(interface{}) error")
if !genSend {
// client streaming, the server will send a response upon close
g.P("SendAndClose(*", outType, ") error")
}
g.P("Close() error") g.P("Close() error")
if genSend { if genSend {
@@ -511,6 +532,17 @@ func (g *micro) generateServerMethod(servName string, method *pb.MethodDescripto
g.P("}") g.P("}")
g.P() g.P()
if !genSend {
// client streaming, the server will send a response upon close
g.P("func (x *", streamType, ") SendAndClose(in *", outType, ") error {")
g.P("if err := x.SendMsg(in); err != nil {")
g.P("return err")
g.P("}")
g.P("return x.stream.Close()")
g.P("}")
g.P()
}
// other types of rpc don't send a response when the stream closes
g.P("func (x *", streamType, ") Close() error {") g.P("func (x *", streamType, ") Close() error {")
g.P("return x.stream.Close()") g.P("return x.stream.Close()")
g.P("}") g.P("}")