diff options
author | Martin Polden <mpolden@mpolden.no> | 2022-04-06 13:59:25 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2022-04-06 13:59:25 +0200 |
commit | 9e7132bfd5319d0129b5ea171126e9a43646a039 (patch) | |
tree | c6192bfaa63850cca4defad533894582f8f19a24 /client | |
parent | 77e9c658f9df1fd6d5353bf0cc7435250d466106 (diff) |
Fix default Vespa log level on deploy
Diffstat (limited to 'client')
-rw-r--r-- | client/go/cmd/deploy.go | 8 | ||||
-rw-r--r-- | client/go/cmd/document.go | 6 | ||||
-rw-r--r-- | client/go/cmd/query.go | 6 | ||||
-rw-r--r-- | client/go/cmd/root.go | 14 |
4 files changed, 19 insertions, 15 deletions
diff --git a/client/go/cmd/deploy.go b/client/go/cmd/deploy.go index 77a40f53522..16da69fded6 100644 --- a/client/go/cmd/deploy.go +++ b/client/go/cmd/deploy.go @@ -89,7 +89,7 @@ $ vespa deploy -t cloud -z perf.aws-us-east-1c`, opts.Target.Deployment().Application.Instance, opts.Target.Deployment().Zone.Environment, opts.Target.Deployment().Zone.Region, result.ID))) } - return waitForQueryService(cli, result.ID) + return waitForQueryService(cli, target, result.ID) }, } cmd.Flags().StringVarP(&logLevelArg, "log-level", "l", "error", `Log level for Vespa logs. Must be "error", "warning", "info" or "debug"`) @@ -157,15 +157,15 @@ func newActivateCmd(cli *CLI) *cobra.Command { return err } cli.printSuccess("Activated ", color.CyanString(pkg.Path), " with session ", sessionID) - return waitForQueryService(cli, sessionID) + return waitForQueryService(cli, target, sessionID) }, } } -func waitForQueryService(cli *CLI, sessionOrRunID int64) error { +func waitForQueryService(cli *CLI, target vespa.Target, sessionOrRunID int64) error { if cli.flags.waitSecs > 0 { log.Println() - _, err := cli.service(vespa.QueryService, sessionOrRunID, "") + _, err := cli.service(target, vespa.QueryService, sessionOrRunID, "") return err } return nil diff --git a/client/go/cmd/document.go b/client/go/cmd/document.go index ac135edad4c..32648393492 100644 --- a/client/go/cmd/document.go +++ b/client/go/cmd/document.go @@ -174,7 +174,11 @@ func newDocumentGetCmd(cli *CLI) *cobra.Command { } func documentService(cli *CLI) (*vespa.Service, error) { - return cli.service(vespa.DocumentService, 0, "") + target, err := cli.target(targetOptions{}) + if err != nil { + return nil, err + } + return cli.service(target, vespa.DocumentService, 0, "") } func operationOptions(stderr io.Writer, printCurl bool, timeoutSecs int) vespa.OperationOptions { diff --git a/client/go/cmd/query.go b/client/go/cmd/query.go index c5868e2f71c..7abf17d5358 100644 --- a/client/go/cmd/query.go +++ b/client/go/cmd/query.go @@ -58,7 +58,11 @@ func printCurl(stderr io.Writer, url string, service *vespa.Service) error { } func query(cli *CLI, arguments []string, timeoutSecs int, curl bool) error { - service, err := cli.service(vespa.QueryService, 0, "") + target, err := cli.target(targetOptions{}) + if err != nil { + return err + } + service, err := cli.service(target, vespa.QueryService, 0, "") if err != nil { return err } diff --git a/client/go/cmd/root.go b/client/go/cmd/root.go index 387c72a1f17..452b1f30834 100644 --- a/client/go/cmd/root.go +++ b/client/go/cmd/root.go @@ -406,19 +406,15 @@ func (c *CLI) system(targetType string) (vespa.System, error) { return vespa.System{}, fmt.Errorf("no default system found for %s target", targetType) } -// service returns the service identified by given name and optionally cluster. This function blocks according to the -// wait period configured in this CLI. The parameter sessionOrRunID specifies either the session ID (local target) or -// run ID (cloud target) to wait for. -func (c *CLI) service(name string, sessionOrRunID int64, cluster string) (*vespa.Service, error) { - t, err := c.target(targetOptions{}) - if err != nil { - return nil, err - } +// service returns the service of given name located at target. If non-empty, cluster specifies a cluster to query. This +// function blocks according to the wait period configured in this CLI. The parameter sessionOrRunID specifies either +// the session ID (local target) or run ID (cloud target) to wait for. +func (c *CLI) service(target vespa.Target, name string, sessionOrRunID int64, cluster string) (*vespa.Service, error) { timeout := time.Duration(c.flags.waitSecs) * time.Second if timeout > 0 { log.Printf("Waiting up to %s %s for %s service to become available ...", color.CyanString(strconv.Itoa(c.flags.waitSecs)), color.CyanString("seconds"), color.CyanString(name)) } - s, err := t.Service(name, timeout, sessionOrRunID, cluster) + s, err := target.Service(name, timeout, sessionOrRunID, cluster) if err != nil { return nil, fmt.Errorf("service '%s' is unavailable: %w", name, err) } |