Thanks to visit codestin.com
Credit goes to github.com

Skip to content

fix(codersdk): abort in-progress writes/reads when closing websocket #12650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ammario merged 1 commit into from
Mar 20, 2024
Merged

fix(codersdk): abort in-progress writes/reads when closing websocket #12650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 17 additions & 0 deletions cli/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"os/signal"
"path/filepath"
"runtime"
"runtime/trace"
"strings"
"syscall"
"text/tabwriter"
Expand Down Expand Up @@ -139,6 +140,22 @@ func (r *RootCmd) AGPL() []*serpent.Command {

// Main is the entrypoint for the Coder CLI.
func (r *RootCmd) RunMain(subcommands []*serpent.Command) {
// This configuration is not available as a standard option because we
// want to trace the entire program, including Options parsing.
goTraceFilePath, ok := os.LookupEnv("CODER_GO_TRACE")
if ok {
traceFile, err := os.OpenFile(goTraceFilePath, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0o644)
if err != nil {
panic(fmt.Sprintf("failed to open trace file: %v", err))
}
defer traceFile.Close()

if err := trace.Start(traceFile); err != nil {
panic(fmt.Sprintf("failed to start trace: %v", err))
}
defer trace.Stop()
}

rand.Seed(time.Now().UnixMicro())

cmd, err := r.Command(subcommands)
Expand Down
2 changes: 1 addition & 1 deletion codersdk/websocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ func (c *wsNetConn) Write(b []byte) (n int, err error) {
}

func (c *wsNetConn) Close() error {
defer c.cancel()
c.cancel()
return c.Conn.Close()
}

Expand Down