From d6b5157effdc923ab6d21655f8220a9d94e26f2e Mon Sep 17 00:00:00 2001 From: Jose Garcia Date: Wed, 13 Oct 2021 14:15:26 -0400 Subject: [PATCH 1/2] Fix for nil logger on non-debugging scenarios --- pkg/cmd/codespace/ssh.go | 10 +++++++--- pkg/liveshare/client.go | 4 ---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go index 928bd044e..f189602da 100644 --- a/pkg/cmd/codespace/ssh.go +++ b/pkg/cmd/codespace/ssh.go @@ -62,17 +62,21 @@ 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 + var liveshareLogger *log.Logger 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()) + } else { + liveshareLogger = noopLogger() } - 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) } diff --git a/pkg/liveshare/client.go b/pkg/liveshare/client.go index 840e99db9..9427ddf05 100644 --- a/pkg/liveshare/client.go +++ b/pkg/liveshare/client.go @@ -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) From 3dbec8655688b54df93918996c942963872fd5d4 Mon Sep 17 00:00:00 2001 From: Jose Garcia Date: Wed, 13 Oct 2021 14:30:33 -0400 Subject: [PATCH 2/2] PR Feedback --- pkg/cmd/codespace/ssh.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkg/cmd/codespace/ssh.go b/pkg/cmd/codespace/ssh.go index f189602da..fbd479c38 100644 --- a/pkg/cmd/codespace/ssh.go +++ b/pkg/cmd/codespace/ssh.go @@ -62,7 +62,7 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e return fmt.Errorf("get or choose codespace: %w", err) } - var liveshareLogger *log.Logger + liveshareLogger := noopLogger() if opts.debug { debugLogger, err := newFileLogger(opts.debugFile) if err != nil { @@ -72,8 +72,6 @@ func (a *App) SSH(ctx context.Context, sshArgs []string, opts sshOptions) (err e liveshareLogger = debugLogger.Logger a.logger.Println("Debug file located at: " + debugLogger.Name()) - } else { - liveshareLogger = noopLogger() } session, err := codespaces.ConnectToLiveshare(ctx, a.logger, liveshareLogger, a.apiClient, codespace)