mirror of
https://github.com/status-im/consul.git
synced 2025-02-02 17:03:31 +00:00
Fix merge conflicts
This commit is contained in:
parent
655da1fc42
commit
7fa01105cc
@ -126,7 +126,7 @@ func TestClientConnPool_ForwardToLeader_Failover(t *testing.T) {
|
|||||||
var servers []testServer
|
var servers []testServer
|
||||||
for i := 0; i < count; i++ {
|
for i := 0; i < count; i++ {
|
||||||
name := fmt.Sprintf("server-%d", i)
|
name := fmt.Sprintf("server-%d", i)
|
||||||
srv := newTestServer(t, name, "dc1")
|
srv := newSimpleTestServer(t, name, "dc1")
|
||||||
res.AddServer(srv.Metadata())
|
res.AddServer(srv.Metadata())
|
||||||
servers = append(servers, srv)
|
servers = append(servers, srv)
|
||||||
t.Cleanup(srv.shutdown)
|
t.Cleanup(srv.shutdown)
|
||||||
|
@ -563,7 +563,7 @@ func newPanicHandler(logger hclog.Logger) recovery.RecoveryHandlerFuncContext {
|
|||||||
// NewGRPCServer creates a grpc.Server, registers the Server, and then returns
|
// NewGRPCServer creates a grpc.Server, registers the Server, and then returns
|
||||||
// the grpc.Server.
|
// the grpc.Server.
|
||||||
func NewGRPCServer(s *Server, tlsConfigurator *tlsutil.Configurator) *grpc.Server {
|
func NewGRPCServer(s *Server, tlsConfigurator *tlsutil.Configurator) *grpc.Server {
|
||||||
recoveryOpts := []recovery.Option{
|
recoveryOpts := []recovery.Option{
|
||||||
recovery.WithRecoveryHandlerContext(newPanicHandler(s.Logger)),
|
recovery.WithRecoveryHandlerContext(newPanicHandler(s.Logger)),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user