Tail Up #86

JakeCooper · 2021-04-07T22:48:29Z

Adds a fetch pointer reset for when status changes
Calls logtail following up

Co-authored-by: amy null <[email protected]>

…to cooper/deployment-logs

controller/logs.go

main.go

Co-authored-by: Gregory Schier <[email protected]>

JakeCooper · 2021-04-08T17:05:32Z

I’ve added a lil loader timeout locally to fix the above

JakeCooper · 2021-04-08T17:06:24Z

RE: Last line yea it’s a small big part of the original log fetcher

Once I merge the refactor I’ll retest but worked on logstreaming

gschier · 2021-04-08T17:45:48Z

RE: Last line yea it’s a small big part of the original log fetcher

😆

Would be amazing to have some tests for this! 🙏🏻

queer · 2021-04-09T17:28:34Z

controller/logs.go

+		idxMp := make(map[string][]string)
+		idxMp[deploy.Status] = strings.Split(deploy.DeployLogs, "\n")


Is this actually correct? Shouldn't it be giving build or deploy logs depending on what the status is?

gschier

I tested locally, and it the formatting stuff seems to be fixed now! Just a few comments on UX and small stuff 🙌🏻

gschier · 2021-04-09T17:21:53Z

controller/logs.go

@@ -68,18  68,26 @@ func (c *Controller) LogsForDeployment(ctx context.Context, req *entity.Deployme
 				return err
 			}


We should also check status == "FAILED" and break out of this

gschier · 2021-04-09T17:26:36Z

cmd/up.go

+	if detach {
+		return nil
+	}
+	return h.ctrl.GetActiveDeploymentLogs(ctx, 0)


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.

gschier · 2021-04-09T17:27:33Z

controller/logs.go

 			// Diff logs using the line numbers as references
-			logDiff := currLogs[len(prevLogs)-1 : len(currLogs)-1]
+			idx := int(math.Max(float64(len(idxMp[deploy.Status])-1), 0.0))


You know, I was happier not knowing that was an emoji.

gschier · 2021-04-09T17:30:18Z

controller/logs.go

 			// Diff logs using the line numbers as references
-			logDiff := currLogs[len(prevLogs)-1 : len(currLogs)-1]
+			idx := int(math.Max(float64(len(idxMp[deploy.Status])-1), 0.0))
+			logDiff := currLogs[idx : len(currLogs)-1]


Is it possible for len(currLogs) == 0? If so, this could panic with currLogs[0:-1].

JakeCooper · 2021-04-09T18:55:49Z

controller/logs.go

+	fmt.Println(strings.Join(logLines[int(offset):], "\n"))
+	if req.NumLines == 0 {
+		// If no log limit is set, we stream logs
+		prevLogs := strings.Split(deploy.BuildLogs, "\n")
+		for {
+			time.Sleep(time.Second * 2)
+			deploy, err := c.gtwy.GetDeploymentByID(ctx, &entity.DeploymentByIDRequest{
+				DeploymentID: req.DeploymentID,
+				ProjectID:    req.ProjectID,
+				GQL:          query,
+			})
+			if err != nil {
+				return err
+			}
+			// Current Logs fetched from server
+			currLogs := strings.Split(deploy.BuildLogs, "\n")
+			// Diff logs using the line numbers as references
+			logDiff := currLogs[len(prevLogs)-1 : len(currLogs)-1]
+			// If no changes we continue
+			if len(logDiff) == 0 {
+				continue
+			}
+			// Output logs
+			fmt.Println(strings.Join(logDiff, "\n"))
 			// Set out walk pointer forward using the newest logs
 			prevLogs = currLogs
+			if deploy.Status != entity.STATUS_BUILDING {
+				break
+			}


These two functions are SO similar and yet I can't seem to figure out a way to abstract the commonalities into something pretty :(

Are the only differences query, deploy.BuildLogs and STATUS_BUILDING references? If so, I'd make a new fn with those as args, then have LogsForBuild and LogsForDeploy call into it.

Mostly, but they also rely on the closure of having prevlogs memory pointer, as well as this for loop which is broken for build logs but not for deployment logs

Will continue a bit but just wanted to mention/get thoughts

JakeCooper · 2021-04-09T20:58:27Z

Refactored such that we're getting logs for Building and Not Building states. Does a little cutesy 2 state FSM and have unified into "GetLogsForState" functions

gschier

Nice lil refactor there 👍🏻

* Deployment Logs in CLI * Deploy Logs in CLI * Live log tail * Remove loggin code * Update main.go Co-authored-by: amy null <[email protected]> * Add detached flag * Don't fetch all deployments everytime * Remove up command * Add line number * Comment * Tail up on deploy * Cant spell FML * Fix flag err * Re add tail detach for up * use latest deploy * Remove println * Remove status indicator * Custom errors * Factor out incorrect errors * Filter out removed * Fix pointer walk * Update main.go Co-authored-by: Gregory Schier <[email protected]> * Flatten root cmd * Remove helper flag * Fix print offset * WTF * As if this section wasn't confusing enough * Use print * Support build log timeouts newlines * Attach to cloud build line * No idxMp * Remove unused function * Move prevwalk up * Remove todo since it's done * Big refactory * Remove unused * Fix NPE * GQL soft error * Handle build failure * Do not export active state * Remove surperfluous build function * Only check logs once * Added lil railway logs fin * Deploy logs Co-authored-by: amy null <[email protected]> Co-authored-by: Gregory Schier <[email protected]>

* Added GQL mutation and finished PoC * Show Teams in Link Command (#81) * Teams in CLI * Team prompts * Fix lint * Only get env variables when updating (#83) * Only get env variables when updating * Update controller/envs.go Co-authored-by: Jake Runzer <[email protected]> Co-authored-by: Jake Runzer <[email protected]> * Warn On Windows (#84) * Warn On Windows * As string * Warning as yello * Newline * Merge * railway logs command (#85) * Deployment Logs in CLI * Fix log polling (#87) * Do not prompt for teams if no teams (#89) * Clean Up Log Controller (#90) * Merge * Remove superfluous fn * Logs * Reference correct slice on project prompt (#91) * GQL Golang Queries (#92) * Merge * Add to lib * Print * Dont print MP * Support nested structs * Remove environment * Update lib/gql/gql.go * Tail Up (#86) * Deployment Logs in CLI * Deploy Logs in CLI * Live log tail * Remove loggin code * Update main.go Co-authored-by: amy null <[email protected]> * Add detached flag * Don't fetch all deployments everytime * Remove up command * Add line number * Comment * Tail up on deploy * Cant spell FML * Fix flag err * Re add tail detach for up * use latest deploy * Remove println * Remove status indicator * Custom errors * Factor out incorrect errors * Filter out removed * Fix pointer walk * Update main.go Co-authored-by: Gregory Schier <[email protected]> * Flatten root cmd * Remove helper flag * Fix print offset * WTF * As if this section wasn't confusing enough * Use print * Support build log timeouts newlines * Attach to cloud build line * No idxMp * Remove unused function * Move prevwalk up * Remove todo since it's done * Big refactory * Remove unused * Fix NPE * GQL soft error * Handle build failure * Do not export active state * Remove surperfluous build function * Only check logs once * Added lil railway logs fin * Deploy logs Co-authored-by: amy null <[email protected]> Co-authored-by: Gregory Schier <[email protected]> * Newline at the end of up * Add some docs * Add redeploy logic and "up" detection * Rename method and print deployment url Co-authored-by: Jake Cooper <[email protected]> Co-authored-by: Jake Runzer <[email protected]> Co-authored-by: amy null <[email protected]>

JakeCooper and others added 16 commits April 6, 2021 20:17

Deployment Logs in CLI

7fb1b1b

Deploy Logs in CLI

c5b9fce

Live log tail

65c97a8

Remove loggin code

eb0d866

Update main.go

6d40cda

Co-authored-by: amy null <[email protected]>

Add detached flag

d9d2c94

Merge branch 'cooper/deployment-logs' of github.com:railwayapp/cli in…

195c813

…to cooper/deployment-logs

Don't fetch all deployments everytime

a156456

Remove up command

37d8166

Add line number

4219921

Comment

5160c21

Tail up on deploy

790cf2f

Cant spell FML

4318461

Fix flag err

f89e601

Merge branch 'cooper/deployment-logs' into cooper/tail-up

68bdaae

Re add tail detach for up

d69764e

coffee-cup reviewed Apr 7, 2021

View reviewed changes

controller/logs.go Outdated Show resolved Hide resolved

controller/logs.go Outdated Show resolved Hide resolved

JakeCooper added 4 commits April 7, 2021 15:52

use latest deploy

14111a3

Remove println

43667d6

Remove status indicator

c5e2e7d

Merge branch 'cooper/deployment-logs' into cooper/tail-up

8211097

gschier reviewed Apr 8, 2021

View reviewed changes

main.go Outdated Show resolved Hide resolved

main.go Outdated Show resolved Hide resolved

JakeCooper and others added 8 commits April 7, 2021 17:42

Custom errors

0b4742e

Factor out incorrect errors

7561a47

Filter out removed

605131c

Tail up

be59758

Fix pointer walk

56874e1

Update main.go

26872fb

Co-authored-by: Gregory Schier <[email protected]>

Flatten root cmd

eaee90c

Remove helper wrapper

ebe870e

Merge branch 'master' into cooper/tail-up

87a4ae6

JakeCooper added 3 commits April 8, 2021 16:13

Merge branch 'master' into cooper/tail-up

33b3dd1

Support build log timeouts newlines

8ee0741

Attach to cloud build line

dc4499f

queer reviewed Apr 9, 2021

View reviewed changes

gschier reviewed Apr 9, 2021

View reviewed changes

JakeCooper added 4 commits April 9, 2021 11:42

No idxMp

ae3b695

Remove unused function

cb6016e

Move prevwalk up

3a8c17d

Remove todo since it's done

3b7edab

JakeCooper commented Apr 9, 2021

View reviewed changes

JakeCooper added 2 commits April 9, 2021 13:55

Big refactory

0a0f732

Remove unused

bc7e15d

JakeCooper added 5 commits April 9, 2021 14:12

Fix NPE

dcd5ac5

GQL soft error

00cbe76

Handle build failure

c85ae11

Do not export active state

9596b7c

Remove surperfluous build function

4267093

gschier approved these changes Apr 9, 2021

View reviewed changes

JakeCooper added 3 commits April 9, 2021 15:27

Only check logs once

1fa5ca9

Added lil railway logs fin

8441dd9

Deploy logs

ddcc28f

JakeCooper merged commit 0c8a4ce into master Apr 10, 2021

JakeCooper deleted the cooper/tail-up branch April 10, 2021 00:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Tail Up #86

Tail Up #86

JakeCooper commented Apr 7, 2021

JakeCooper commented Apr 8, 2021

JakeCooper commented Apr 8, 2021

gschier commented Apr 8, 2021 •

edited

Loading

queer Apr 9, 2021

gschier left a comment

gschier Apr 9, 2021

gschier Apr 9, 2021

gschier Apr 9, 2021

queer Apr 9, 2021

gschier Apr 9, 2021

JakeCooper Apr 9, 2021

gschier Apr 9, 2021

JakeCooper Apr 9, 2021

JakeCooper commented Apr 9, 2021

gschier left a comment

		idxMp := make(map[string][]string)
		idxMp[deploy.Status] = strings.Split(deploy.DeployLogs, "\n")

		@@ -68,18 68,26 @@ func (c Controller) LogsForDeployment(ctx context.Context, req entity.Deployme
		return err
		}

Tail Up #86

Tail Up #86

Conversation

JakeCooper commented Apr 7, 2021

JakeCooper commented Apr 8, 2021

JakeCooper commented Apr 8, 2021

gschier commented Apr 8, 2021 • edited Loading

Choose a reason for hiding this comment

gschier left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

JakeCooper commented Apr 9, 2021

gschier left a comment

Choose a reason for hiding this comment

gschier commented Apr 8, 2021 •

edited

Loading