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

Merge pull request #4511 from cli/jg/keepalive-fix

Browse source 
codespace ssh: fix for nil logger on non-debugging scenarios
This commit is contained in:
Jose Garcia 2021-10-13 14:44:10 -04:00 • committed by GitHub
commit d5c9630fae
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkg/cmd/codespace/ssh.go
View file

@ -62,17 +62,19 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e
return fmt.Errorf("get or choose codespace: %w", err)
}
var debugLogger *fileLogger
liveshareLogger := noopLogger()
if opts.debug {
debugLogger, err = newFileLogger(opts.debugFile)
debugLogger, err := newFileLogger(opts.debugFile)
if err != nil {
return fmt.Errorf("error creating debug logger: %w", err)
}
defer safeClose(debugLogger, &err)
liveshareLogger = debugLogger.Logger
a.logger.Println("Debug file located at: " + debugLogger.Name())
}
session, err := codespaces.ConnectToLiveshare(ctx, a.logger, debugLogger, a.apiClient, codespace)
session, err := codespaces.ConnectToLiveshare(ctx, a.logger, liveshareLogger, a.apiClient, codespace)
if err != nil {
return fmt.Errorf("error connecting to Live Share: %w", err)
}

4
pkg/liveshare/client.go
View file

@ -75,10 +75,6 @@ func Connect(ctx context.Context, opts Options) (*Session, error) {
return nil, err
}
if opts.Logger == nil {
return nil, errors.New("Logger is required")
}
sock := newSocket(uri, opts.TLSConfig)
if err := sock.connect(ctx); err != nil {
return nil, fmt.Errorf("error connecting websocket: %w", err)