error generate in standalone mode
Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>
This commit is contained in:
parent
5565534f79
commit
6152d866d6
8
main.go
8
main.go
@ -90,6 +90,9 @@ func (g *Generator) Generate(plugin *protogen.Plugin) error {
|
||||
continue
|
||||
case "micro":
|
||||
err = g.microGenerate(component, plugin, genClient, genServer)
|
||||
if err == nil {
|
||||
err = g.writeErrors(plugin)
|
||||
}
|
||||
case "http":
|
||||
err = g.httpGenerate(component, plugin, genClient, genServer)
|
||||
case "grpc", "drpc", "rpc":
|
||||
@ -113,11 +116,6 @@ func (g *Generator) Generate(plugin *protogen.Plugin) error {
|
||||
|
||||
}
|
||||
|
||||
if err = g.writeErrors(plugin); err != nil {
|
||||
plugin.Error(err)
|
||||
return err
|
||||
}
|
||||
|
||||
if err = g.astGenerate(plugin); err != nil {
|
||||
plugin.Error(err)
|
||||
return err
|
||||
|
11
util.go
11
util.go
@ -975,8 +975,10 @@ func (g *Generator) writeErrors(plugin *protogen.Plugin) error {
|
||||
}
|
||||
|
||||
var gfile *protogen.GeneratedFile
|
||||
var importPath protogen.GoImportPath
|
||||
|
||||
if len(errorsMap) > 0 {
|
||||
gfile = plugin.NewGeneratedFile("micro_errors.pb.go", ".")
|
||||
|
||||
var packageName string
|
||||
|
||||
for _, file := range plugin.Files {
|
||||
@ -987,9 +989,16 @@ func (g *Generator) writeErrors(plugin *protogen.Plugin) error {
|
||||
continue
|
||||
}
|
||||
packageName = string(file.GoPackageName)
|
||||
importPath = file.GoImportPath
|
||||
break
|
||||
}
|
||||
|
||||
if g.standalone {
|
||||
importPath = "."
|
||||
}
|
||||
|
||||
gfile = plugin.NewGeneratedFile("micro_errors.pb.go", importPath)
|
||||
|
||||
gfile.P("// Code generated by protoc-gen-go-micro. DO NOT EDIT.")
|
||||
gfile.P("// protoc-gen-go-micro version: " + versionComment)
|
||||
gfile.P()
|
||||
|
Loading…
Reference in New Issue
Block a user