Browse Source

finish remaining grpc observatory api

Shelikhoo 4 years ago
parent
commit
a42ef81ac0
2 changed files with 11 additions and 4 deletions
  1. 10 3
      app/observatory/command/command.go
  2. 1 1
      infra/conf/api.go

+ 10 - 3
app/observatory/command/command.go

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

+ 1 - 1
infra/conf/api.go

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