This repository was archived by the owner on Aug 30, 2024. It is now read-only.
- Notifications
You must be signed in to change notification settings - Fork18
Fix coder sh freeze#41
Merged
Uh oh!
There was an error while loading.Please reload this page.
Merged
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
31 changes: 25 additions & 6 deletionscmd/coder/shell.go
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -99,7 +99,7 @@ func (cmd *shellCmd) Run(fl *pflag.FlagSet) { | ||
| os.Exit(exitErr.Code) | ||
| } | ||
| if err != nil { | ||
| flog.Fatal("run command: %v. Is%q online?", err, envName) | ||
| } | ||
| } | ||
| @@ -120,6 +120,9 @@ func runCommand(ctx context.Context, envName string, command string, args []stri | ||
| defer restore() | ||
| } | ||
| ctx, cancel := context.WithCancel(ctx) | ||
| defer cancel() | ||
| conn, err := entClient.DialWsep(ctx, env) | ||
| if err != nil { | ||
| return err | ||
| @@ -142,10 +145,26 @@ func runCommand(ctx context.Context, envName string, command string, args []stri | ||
| go func() { | ||
| stdin := process.Stdin() | ||
| defer stdin.Close() | ||
| _, err := io.Copy(stdin, os.Stdin) | ||
| if err != nil { | ||
| cancel() | ||
| } | ||
| }() | ||
| go func() { | ||
| _, err := io.Copy(os.Stdout, process.Stdout()) | ||
| if err != nil { | ||
| cancel() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. nitpick: If one of these closes both do... It's fair to just defer cancel() at the top of both There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others.Learn more. I don't think it's good to depend on that behavior though... | ||
| } | ||
| }() | ||
| go func() { | ||
| _, err := io.Copy(os.Stderr, process.Stderr()) | ||
| if err != nil { | ||
| cancel() | ||
| } | ||
| }() | ||
| err = process.Wait() | ||
| if xerrors.Is(err, ctx.Err()) { | ||
| return xerrors.Errorf("network error") | ||
| } | ||
| return err | ||
| } | ||
6 changes: 3 additions & 3 deletionsgo.mod
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletionsgo.sum
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.