luxolus
/
open-vault
2
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

backport of commit f12c1285599a1519273bfa68472c598b1fd635bf (#21348) 

Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>
This commit is contained in:
hc-github-team-secure-vault-core 2023-06-19 11:40:23 -04:00 committed by GitHub
parent 100f402ac8
commit ee92f78611
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 0 deletions
Show Stats 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