Fix issue with status not returning controller version on 6.0.43

This commit is contained in:
Paul Tyng
2021-03-07 11:00:18 -05:00
parent 23f4659d36
commit 3eb04af6a7
2 changed files with 103 additions and 2 deletions

View File

@@ -168,7 +168,24 @@ func (c *Client) Login(ctx context.Context, user, pass string) error {
if err != nil {
return err
}
c.version = status.Meta.ServerVersion
if version := status.Meta.ServerVersion; version != "" {
c.version = status.Meta.ServerVersion
return nil
}
// newer version of 6.0 controller, use sysinfo to determine version
// using default site since it must exist
si, err := c.sysinfo(ctx, "default")
if err != nil {
return err
}
c.version = si.Version
if c.version == "" {
return fmt.Errorf("unable to determine controller version")
}
return nil
}
@@ -227,7 +244,6 @@ func (c *Client) do(ctx context.Context, method, relativeURL string, reqBody int
}
if resp.StatusCode != 200 {
fmt.Printf("Request Body:\n%s\n", string(reqBytes))
errBody := struct {
Meta meta `json:"meta"`
}{}