Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings
This repository was archived by the owner on Aug 30, 2024. It is now read-only.
/coder-v1-cliPublic archive

Show network error on unexpected disconnect#88

Merged
cmoog merged 1 commit intomasterfromclose-err
Aug 3, 2020
Merged
Changes fromall commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 11 additions & 3 deletionscmd/coder/shell.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,6 +126,10 @@ func runCommand(ctx context.Context, envName string, command string, args []stri
Env: cmdEnv,
})
if err != nil {
var closeErr websocket.CloseError
if xerrors.As(err, &closeErr) {
return xerrors.Errorf("network error, is %q online?", envName)
}
return err
}

Expand DownExpand Up@@ -157,10 +161,14 @@ func runCommand(ctx context.Context, envName string, command string, args []stri
}
}()
err = process.Wait()
if err != nil && xerrors.Is(err, ctx.Err()) {
return xerrors.Errorf("network error, is %q online?", envName)
if err != nil {
var closeErr websocket.CloseError
if xerrors.Is(err, ctx.Err()) || xerrors.As(err, &closeErr) {
return xerrors.Errorf("network error, is %q online?", envName)
}
return err
}
returnerr
returnnil
}

func heartbeat(ctx context.Context, c *websocket.Conn, interval time.Duration) {
Expand Down

[8]ページ先頭

©2009-2025 Movatter.jp