Skip to content

Add analyer-name to lookout-sdk comments #632

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
carlosms merged 1 commit into from
Apr 19, 2019
Merged

Add analyer-name to lookout-sdk comments #632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions cmd/lookout-sdk/event.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ func (c *EventCommand) initDataServer(srv *lookout.DataServerHandler) (startFunc
return start, stop
}

func (c *EventCommand) analyzerClient() (lookout.AnalyzerClient, error) {
func (c *EventCommand) analyzer() (lookout.Analyzer, error) {
if c.Args.Analyzer == "" {
c.Args.Analyzer = "ipv4://localhost:9930"
}
Expand All @@ -177,7 +177,7 @@ func (c *EventCommand) analyzerClient() (lookout.AnalyzerClient, error) {

grpcAddr, err := pb.ToGoGrpcAddress(c.Args.Analyzer)
if err != nil {
return nil, fmt.Errorf("Can't resolve address of analyzer '%s': %s", c.Args.Analyzer, err)
return lookout.Analyzer{}, fmt.Errorf("Can't resolve address of analyzer '%s': %s", c.Args.Analyzer, err)
}

timeoutCtx, cancel := context.WithTimeout(context.Background(), time.Second)
Expand All @@ -188,10 +188,18 @@ func (c *EventCommand) analyzerClient() (lookout.AnalyzerClient, error) {
grpc.WithBlock(),
)
if err != nil {
return nil, fmt.Errorf("Can't connect to analyzer '%s': %s", grpcAddr, err)
return lookout.Analyzer{}, fmt.Errorf("Can't connect to analyzer '%s': %s", grpcAddr, err)
}

return lookout.NewAnalyzerClient(conn), nil
client := lookout.NewAnalyzerClient(conn)

return lookout.Analyzer{
Client: client,
Config: lookout.AnalyzerConfig{
Name: "test-analyzer",
Addr: c.Args.Analyzer,
},
}, nil
}

func (c *EventCommand) parseConfig() (types.Struct, error) {
Expand Down
4 changes: 2 additions & 2 deletions cmd/lookout-sdk/push.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func (c *PushCommand) Execute(args []string) error {
stopCh <- startDataServer()
}()

client, err := c.analyzerClient()
analyzer, err := c.analyzer()
if err != nil {
return err
}
Expand All @@ -64,7 +64,7 @@ func (c *PushCommand) Execute(args []string) error {
Poster: json.NewPoster(os.Stdout),
FileGetter: dataHandler.FileGetter,
Analyzers: map[string]lookout.Analyzer{
"test-analyzer": lookout.Analyzer{Client: client},
analyzer.Config.Name: analyzer,
},
ExitOnError: true,
})
Expand Down
4 changes: 2 additions & 2 deletions cmd/lookout-sdk/review.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ func (c *ReviewCommand) Execute(args []string) error {
stopCh <- startDataServer()
}()

client, err := c.analyzerClient()
analyzer, err := c.analyzer()
if err != nil {
return err
}
Expand All @@ -60,7 +60,7 @@ func (c *ReviewCommand) Execute(args []string) error {
Poster: json.NewPoster(os.Stdout),
FileGetter: dataHandler.FileGetter,
Analyzers: map[string]lookout.Analyzer{
"test-analyzer": lookout.Analyzer{Client: client},
analyzer.Config.Name: analyzer,
},
ExitOnError: true,
})
Expand Down