lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-06-20 22:45:24 +00:00
Code Issues Releases Wiki Activity

finish remaining grpc observatory api

Browse Source
This commit is contained in:
Shelikhoo 2021-03-06 21:08:27 +00:00
parent a168ff3df6
commit a42ef81ac0
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/observatory/command/command.go
View File

@ -13,11 +13,11 @@ type service struct {
UnimplementedObservatoryServiceServer
v *core.Instance
Observatory extension.Observatory
observatory extension.Observatory
}
func (s *service) GetOutboundStatus(ctx context.Context, request *GetOutboundStatusRequest) (*GetOutboundStatusResponse, error) {
resp, err := s.Observatory.GetObservation(ctx)
resp, err := s.observatory.GetObservation(ctx)
if err != nil {
return nil, err
}
@ -34,6 +34,13 @@ func (s *service) Register(server *grpc.Server) {
func init() {
common.Must(common.RegisterConfig((*Config)(nil), func(ctx context.Context, cfg interface{}) (interface{}, error) {
s := core.MustFromContext(ctx)
return &service{v: s}, nil
sv := &service{v: s}
err := s.RequireFeatures(func(Observatory extension.Observatory) {
sv.observatory = Observatory
})
if err != nil {
return nil, err
}
return sv, nil
}))
}

2
infra/conf/api.go
View File

@ -37,7 +37,7 @@ func (c *APIConfig) Build() (*commander.Config, error) {
if !strings.HasPrefix(s, "#") {
continue
}
message, err := desc.LoadMessageDescriptor(s[:])
message, err := desc.LoadMessageDescriptor(s[1:])
if err != nil || message == nil {
return nil, newError("Cannot find API", s, "").Base(err)
}