scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-10-29 17:52:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't exit just because we think there was a possible deadlock (#21342)

Browse Source
This commit is contained in:
Nick Cabatoff
2023-06-19 11:08:34 -04:00
committed by GitHub
parent 8af6780325
commit f12c128559
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
changelog/21342.txt Normal file
View File

@@ -0,0 +1,3 @@
```release-note:bug
core: Don't exit just because we think there's a potential deadlock.
```

4
command/server.go
View File

@@ -63,6 +63,7 @@ import (
"github.com/mitchellh/go-testing-interface" "github.com/mitchellh/go-testing-interface"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/posener/complete" "github.com/posener/complete"
"github.com/sasha-s/go-deadlock"
"go.uber.org/atomic" "go.uber.org/atomic"
"golang.org/x/net/http/httpproxy" "golang.org/x/net/http/httpproxy"
"google.golang.org/grpc/grpclog" "google.golang.org/grpc/grpclog"
@@ -1001,6 +1002,9 @@ func (c *ServerCommand) Run(args []string) int {
return 1 return 1
} }
// Don't exit just because we saw a potential deadlock.
deadlock.Opts.OnPotentialDeadlock = func() {}
c.logGate = gatedwriter.NewWriter(os.Stderr) c.logGate = gatedwriter.NewWriter(os.Stderr)
c.logWriter = c.logGate c.logWriter = c.logGate