Tail Up #86
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 1,15 @@ | ||
| package cmd | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| "github.com/railwayapp/cli/entity" | ||
| ) | ||
|
|
||
| func (h *Handler) Logs(ctx context.Context, req *entity.CommandRequest) error { | ||
| numLines, err := req.Cmd.Flags().GetInt32("num_lines") | ||
| if err != nil { | ||
| return err | ||
| } | ||
| return h.ctrl.GetActiveDeploymentLogs(ctx, numLines) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 1,76 @@ | ||
| package controller | ||
|
|
||
| import ( | ||
| "context" | ||
| "fmt" | ||
| "math" | ||
| "strings" | ||
| "time" | ||
|
|
||
| "github.com/railwayapp/cli/entity" | ||
| ) | ||
|
|
||
| func (c *Controller) GetActiveDeploymentLogs(ctx context.Context, numLines int32) error { | ||
| projectID, err := c.cfg.GetProject() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| environmentID, err := c.cfg.GetEnvironment() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| deployments, err := c.gtwy.GetDeploymentsForEnvironment(ctx, projectID, environmentID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
|
||
| latestDeploy := deployments[0] | ||
| // Streaming | ||
| prevIdx := 0 | ||
| status := latestDeploy.Status | ||
| for { | ||
| err := func() error { | ||
| if prevIdx != 0 { | ||
| time.Sleep(time.Second * 2) | ||
| } | ||
| deploy, err := c.gtwy.GetDeploymentByID(ctx, projectID, latestDeploy.ID) | ||
| if err != nil { | ||
| return err | ||
| } | ||
|
There was a problem hiding this comment. We should also check |
||
| if deploy.Status != status { | ||
| // Reset when moving states | ||
| prevIdx = 0 | ||
| status = deploy.Status | ||
| } | ||
| logs := fetchCurrentLogs(*deploy) | ||
| partials := strings.Split(logs, "\n") | ||
| nextIdx := len(partials) | ||
| delimiter := prevIdx | ||
| if numLines != 0 { | ||
| // If num is provided do a walkback by n lines to get latest n logs | ||
| delimiter = int(math.Max(float64(len(partials)-int(numLines)), float64(prevIdx))) | ||
| } | ||
| delta := partials[delimiter:nextIdx] | ||
| if len(delta) == 0 { | ||
| return nil | ||
| } | ||
| fmt.Println(strings.Join(delta, "\n")) | ||
| prevIdx = nextIdx | ||
| return nil | ||
| }() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if numLines != 0 { | ||
| // Break if numlines provided | ||
| return nil | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func fetchCurrentLogs(deployment entity.Deployment) string { | ||
| if deployment.Status == "BUILDING" { | ||
| return deployment.BuildLogs | ||
| } | ||
| return deployment.DeployLogs | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 1,8 @@ | ||
| package entity | ||
|
|
||
| type Deployment struct { | ||
| ID string `json:"id"` | ||
| BuildLogs string `json:"buildLogs"` | ||
| DeployLogs string `json:"deployLogs"` | ||
| Status string `json:"status"` | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 1,64 @@ | ||
| package gateway | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| gql "github.com/machinebox/graphql" | ||
| "github.com/railwayapp/cli/entity" | ||
| "github.com/railwayapp/cli/errors" | ||
| ) | ||
|
|
||
| func (g *Gateway) GetDeploymentsForEnvironment(ctx context.Context, projectId string, environmentId string) ([]entity.Deployment, error) { | ||
| gqlReq := gql.NewRequest(` | ||
| query ($projectId: ID!, $environmentId: ID!) { | ||
| allDeploymentsForEnvironment(projectId: $projectId, environmentId: $environmentId) { | ||
| id | ||
| status | ||
| } | ||
| } | ||
| `) | ||
|
|
||
| gqlReq.Var("projectId", projectId) | ||
| gqlReq.Var("environmentId", environmentId) | ||
|
|
||
| err := g.authorize(ctx, gqlReq.Header) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| var resp struct { | ||
| Deployments []entity.Deployment `json:"allDeploymentsForEnvironment"` | ||
| } | ||
| if err := g.gqlClient.Run(ctx, gqlReq, &resp); err != nil { | ||
| return nil, errors.PluginGetFailed | ||
| } | ||
| return resp.Deployments, nil | ||
| } | ||
|
|
||
| func (g *Gateway) GetDeploymentByID(ctx context.Context, projectId string, deploymentId string) (*entity.Deployment, error) { | ||
| gqlReq := gql.NewRequest(` | ||
| query ($projectId: ID!, $deploymentId: ID!) { | ||
| deploymentById(projectId: $projectId, deploymentId: $deploymentId) { | ||
| id | ||
| buildLogs | ||
| deployLogs | ||
| status | ||
| } | ||
| } | ||
| `) | ||
| gqlReq.Var("projectId", projectId) | ||
| gqlReq.Var("deploymentId", deploymentId) | ||
|
|
||
| err := g.authorize(ctx, gqlReq.Header) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
|
|
||
| var resp struct { | ||
| Deployment *entity.Deployment `json:"deploymentById"` | ||
| } | ||
| if err := g.gqlClient.Run(ctx, gqlReq, &resp); err != nil { | ||
| return nil, errors.PluginGetFailed | ||
| } | ||
| return resp.Deployment, nil | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Does this mean that
railway up, by default, streams both build and runtime logs indefinitely after?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes it does
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think I'd vote to only see build logs after
up.My flow is usually to make sure the deploy worked, then go back to writing code. Right now it's difficult to see when it switches from build to deploy then you have to ctrl-C out (which may also not be obvious to less-experienced devs).
One idea might be to detect when the build succeeded and prompt the user to continue streaming the deploy logs or exit.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I figured the "Build Completed" line is solid for this
My issue is that we fire build completed regardless of outcome, and only fetch the actual deployment logs (Which contains the "Failed to Deploy!" stuff. If we do a prompt, users might not see that
Could see it either way tho. Don't really have a strong opinion so can add a prompt pretty easily