Gracefully handle proxy errors in the shell command #411
Conversation
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
Member
|
This looks good. There are two edge cases, though, that could make it still stuck:
I added an improvement that solves both cases. I didn't pushed it to your branch, but you can apply the patch directly: diff --git a/internal/cmd/shell/shell.go b/internal/cmd/shell/shell.go
index e537c57..ebedb07 100644
--- a/internal/cmd/shell/shell.go
+++ b/internal/cmd/shell/shell.go
@@ -7,6 +7,7 @@ import (
"net"
"os"
"path/filepath"
+ "time"
"github.com/planetscale/cli/internal/cmdutil"
"github.com/planetscale/cli/internal/printer"
@@ -116,14 +117,9 @@ second argument:
return fmt.Errorf("couldn't create proxy client: %s", err)
}
- var errCh chan error
-
+ errCh := make(chan error, 1)
go func() {
- err := p.Run(ctx)
- if err != nil {
- errCh = make(chan error, 1)
- errCh <- err
- }
+ errCh <- p.Run(ctx)
}()
dbBranch, err := client.DatabaseBranches.Get(ctx, &ps.GetDatabaseBranchRequest{
@@ -145,8 +141,11 @@ second argument:
return errors.New("database branch is not ready yet")
}
- if errCh != nil {
- return <-errCh
+ select {
+ case proxyErr := <-errCh:
+ return proxyErr
+ case <-time.After(time.Second * 10):
+ return errors.New("proxy timeout retrieving the certs")
}
addr, err := p.LocalAddr()
|
Contributor
Author
|
@fatih With this select block, won't it always return early because we're always sending an error to it? We don't want to |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
This pull request handles the errors from running the proxy in a goroutine more gracefully. Before, we'd ignore any errors that happen when the proxy starts up, so the program would freeze when we try to get the local address. Now we conditionally create an error channel to return the errors from the the proxy runner gracefully.