Skip to content

fix: increase server shutdown timeout #370

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
zepatrik merged 2 commits into from
Aug 2, 2024
Merged

fix: increase server shutdown timeout #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
901408a
fix: increase server shutdown timeout
zepatrik Aug 2, 2024
0808cdf
chore: bump docker and other dependencies
zepatrik Aug 2, 2024
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
2 changes: 1 addition & 1 deletion cmd/cloudx/client/auth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,7 +259,7 @@ func (h *CommandHelper) oAuth2DanceWithServer(ctx context.Context, client *oauth
case token = <-serverToken:
case err = <-serverErr:
}
ctx, cancel := context.WithDeadline(context.WithoutCancel(ctx), time.Now().Add(2*time.Second))
ctx, cancel := context.WithDeadline(context.WithoutCancel(ctx), time.Now().Add(20*time.Second))
defer cancel()
return stderrors.Join(err, srv.Shutdown(ctx))
})
Expand Down
2 changes: 1 addition & 1 deletion cmd/cloudx/client/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"net/http"
"strings"

"dario.cat/mergo"
"github.com/gofrs/uuid"
"github.com/imdario/mergo"
"github.com/pkg/errors"

"github.com/ory/client-go"
Expand Down
4 changes: 2 additions & 2 deletions cmd/dev/openapi/migrate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ Example:
`,
Args: cobra.ExactArgs(2),
RunE: func(cmd *cobra.Command, args []string) error {
var oas2 openapi2.Swagger
var oas2 openapi2.T

in, err := os.ReadFile(args[0])
if err != nil {
Expand All @@ -66,7 +66,7 @@ Example:
return errors.WithStack(err)
}

oas3, err := openapi2conv.ToV3Swagger(&oas2)
oas3, err := openapi2conv.ToV3(&oas2)
if err != nil {
return errors.WithStack(err)
}
Expand Down
Loading