mirror of
https://github.com/optim-enterprises-bv/vault.git
synced 2025-11-03 03:58:01 +00:00
backport of commit f12c128559 (#21348)
Co-authored-by: Nick Cabatoff <ncabatoff@hashicorp.com>
This commit is contained in:
committed by
GitHub
parent
dd62be3bfb
commit
13a649f860
3
changelog/21342.txt
Normal file
3
changelog/21342.txt
Normal file
@@ -0,0 +1,3 @@
|
||||
```release-note:bug
|
||||
core: Don't exit just because we think there's a potential deadlock.
|
||||
```
|
||||
@@ -63,6 +63,7 @@ import (
|
||||
"github.com/mitchellh/go-testing-interface"
|
||||
"github.com/pkg/errors"
|
||||
"github.com/posener/complete"
|
||||
"github.com/sasha-s/go-deadlock"
|
||||
"go.uber.org/atomic"
|
||||
"golang.org/x/net/http/httpproxy"
|
||||
"google.golang.org/grpc/grpclog"
|
||||
@@ -1001,6 +1002,9 @@ func (c *ServerCommand) Run(args []string) int {
|
||||
return 1
|
||||
}
|
||||
|
||||
// Don't exit just because we saw a potential deadlock.
|
||||
deadlock.Opts.OnPotentialDeadlock = func() {}
|
||||
|
||||
c.logGate = gatedwriter.NewWriter(os.Stderr)
|
||||
c.logWriter = c.logGate
|
||||
|
||||
|
||||
Reference in New Issue
Block a user