TRKJ/EdgeAPI
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeAPI.git synced 2025-11-08 19:40:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化错误提示

Browse Source
This commit is contained in:
刘祥超
2023-06-16 08:17:00 +08:00
parent 2aceb4fb4d
commit eee902abec
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
internal/nodes/api_node.go
View File

@@ -28,6 +28,7 @@ import (
"github.com/iwind/gosock/pkg/gosock" "github.com/iwind/gosock/pkg/gosock"
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/credentials" "google.golang.org/grpc/credentials"
"google.golang.org/grpc/status"
"gopkg.in/yaml.v3" "gopkg.in/yaml.v3"
"log" "log"
"net" "net"
@@ -832,7 +833,12 @@ func (this *APINode) unaryInterceptor(ctx context.Context, req any, info *grpc.U
} }
result, err := handler(ctx, req) result, err := handler(ctx, req)
if err != nil { if err != nil {
err = errors.New("'" + info.FullMethod + "()' says: " + err.Error()) statusErr, ok := status.FromError(err)
if ok {
err = status.Error(statusErr.Code(), "'" + info.FullMethod + "()' says: " + err.Error())
} else {
err = errors.New("'" + info.FullMethod + "()' says: " + err.Error())
}
} }
return result, err return result, err
} }

4
internal/rpc/services/service_base.go
View File

@@ -16,7 +16,9 @@ import (
"github.com/iwind/TeaGo/dbs" "github.com/iwind/TeaGo/dbs"
"github.com/iwind/TeaGo/lists" "github.com/iwind/TeaGo/lists"
"github.com/iwind/TeaGo/maps" "github.com/iwind/TeaGo/maps"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"google.golang.org/grpc/status"
) )
type BaseService struct { type BaseService struct {
@@ -229,7 +231,7 @@ func (this *BaseService) PermissionError() error {
} }
func (this *BaseService) NotImplementedYet() error { func (this *BaseService) NotImplementedYet() error {
return errors.New("not implemented yet") return status.Error(codes.Unimplemented, "not implemented yet")
} }
// NullTx 空的数据库事务 // NullTx 空的数据库事务