STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #108 from github/update-liveshare

Browse source 
Update go-liveshare to v0.10.0
This commit is contained in:
Alan Donovan 2021-09-02 09:48:28 -04:00 • committed by GitHub
commit 45f9ae76f4
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cmd/ghcs/logs.go
View file

@ -88,7 +88,7 @@ func logs(ctx context.Context, tail bool, codespaceName string) error {
tunnelClosed := make(chan error, 1)
go func() {
tunnelClosed <- tunnel.Start(ctx) // error is non-nil
tunnelClosed <- tunnel.Forward(ctx) // error is non-nil
}()
cmdDone := make(chan error, 1)

2
cmd/ghcs/ports.go
View file

@ -307,7 +307,7 @@ func forwardPorts(log *output.Logger, codespaceName string, ports []string) erro
g.Go(func() error {
log.Println("Forwarding port: " + srcstr + " ==> " + strconv.Itoa(pp.dst))
portForwarder := liveshare.NewPortForwarder(lsclient, server, pp.dst)
if err := portForwarder.Start(gctx); err != nil {
if err := portForwarder.Forward(gctx); err != nil {
return fmt.Errorf("error forwarding port: %v", err)
}

2
cmd/ghcs/ssh.go
View file

@ -105,7 +105,7 @@ func ssh(ctx context.Context, sshProfile, codespaceName string, localSSHServerPo
tunnelClosed := make(chan error)
go func() {
tunnelClosed <- tunnel.Start(ctx) // error is always non-nil
tunnelClosed <- tunnel.Forward(ctx) // error is always non-nil
}()
shellClosed := make(chan error)

2
internal/codespaces/states.go
View file

@ -62,7 +62,7 @@ func PollPostCreateStates(ctx context.Context, log logger, apiClient *api.API, u
tunnelClosed := make(chan error, 1) // buffered to avoid sender stuckness
go func() {
tunnelClosed <- fwd.Start(ctx) // error is non-nil
tunnelClosed <- fwd.Forward(ctx) // error is non-nil
}()
t := time.NewTicker(1 * time.Second)