diff --git a/server/cmd/blob/initialize/registry.go b/server/cmd/blob/initialize/registry.go index 867fd791..d3a38552 100644 --- a/server/cmd/blob/initialize/registry.go +++ b/server/cmd/blob/initialize/registry.go @@ -16,9 +16,14 @@ import ( // InitRegistry to init consul func InitRegistry(Port int) (registry.Registry, *registry.Info) { - r, err := consul.NewConsulRegisterWithConfig(&api.Config{Address: net.JoinHostPort( + r, err := consul.NewConsulRegister(net.JoinHostPort( config.GlobalConsulConfig.Host, - strconv.Itoa(config.GlobalConsulConfig.Port))}) + strconv.Itoa(config.GlobalConsulConfig.Port)), + consul.WithCheck(&api.AgentServiceCheck{ + Interval: consts.ConsulCheckInterval, + Timeout: consts.ConsulCheckTimeout, + DeregisterCriticalServiceAfter: consts.ConsulCheckDeregisterCriticalServiceAfter, + })) if err != nil { klog.Fatalf("new consul register failed: %s", err.Error()) } diff --git a/server/cmd/car/initialize/registry.go b/server/cmd/car/initialize/registry.go index 8ad0f1c1..ca07404b 100644 --- a/server/cmd/car/initialize/registry.go +++ b/server/cmd/car/initialize/registry.go @@ -16,9 +16,14 @@ import ( // InitRegistry to init consul func InitRegistry(Port int) (registry.Registry, *registry.Info) { - r, err := consul.NewConsulRegisterWithConfig(&api.Config{Address: net.JoinHostPort( + r, err := consul.NewConsulRegister(net.JoinHostPort( config.GlobalConsulConfig.Host, - strconv.Itoa(config.GlobalConsulConfig.Port))}) + strconv.Itoa(config.GlobalConsulConfig.Port)), + consul.WithCheck(&api.AgentServiceCheck{ + Interval: consts.ConsulCheckInterval, + Timeout: consts.ConsulCheckTimeout, + DeregisterCriticalServiceAfter: consts.ConsulCheckDeregisterCriticalServiceAfter, + })) if err != nil { klog.Fatalf("new consul register failed: %s", err.Error()) } diff --git a/server/cmd/profile/initialize/registry.go b/server/cmd/profile/initialize/registry.go index ea0a2e05..3c16a922 100644 --- a/server/cmd/profile/initialize/registry.go +++ b/server/cmd/profile/initialize/registry.go @@ -16,9 +16,14 @@ import ( // InitRegistry to init consul func InitRegistry(Port int) (registry.Registry, *registry.Info) { - r, err := consul.NewConsulRegisterWithConfig(&api.Config{Address: net.JoinHostPort( + r, err := consul.NewConsulRegister(net.JoinHostPort( config.GlobalConsulConfig.Host, - strconv.Itoa(config.GlobalConsulConfig.Port))}) + strconv.Itoa(config.GlobalConsulConfig.Port)), + consul.WithCheck(&api.AgentServiceCheck{ + Interval: consts.ConsulCheckInterval, + Timeout: consts.ConsulCheckTimeout, + DeregisterCriticalServiceAfter: consts.ConsulCheckDeregisterCriticalServiceAfter, + })) if err != nil { klog.Fatalf("new consul register failed: %s", err.Error()) } diff --git a/server/cmd/trip/initialize/registry.go b/server/cmd/trip/initialize/registry.go index 11cedf39..3e5eb987 100644 --- a/server/cmd/trip/initialize/registry.go +++ b/server/cmd/trip/initialize/registry.go @@ -16,9 +16,14 @@ import ( // InitRegistry to init consul func InitRegistry(Port int) (registry.Registry, *registry.Info) { - r, err := consul.NewConsulRegisterWithConfig(&api.Config{Address: net.JoinHostPort( + r, err := consul.NewConsulRegister(net.JoinHostPort( config.GlobalConsulConfig.Host, - strconv.Itoa(config.GlobalConsulConfig.Port))}) + strconv.Itoa(config.GlobalConsulConfig.Port)), + consul.WithCheck(&api.AgentServiceCheck{ + Interval: consts.ConsulCheckInterval, + Timeout: consts.ConsulCheckTimeout, + DeregisterCriticalServiceAfter: consts.ConsulCheckDeregisterCriticalServiceAfter, + })) if err != nil { klog.Fatalf("new consul register failed: %s", err.Error()) } diff --git a/server/cmd/user/initialize/registry.go b/server/cmd/user/initialize/registry.go index 1e1734c8..7f1531cc 100644 --- a/server/cmd/user/initialize/registry.go +++ b/server/cmd/user/initialize/registry.go @@ -16,9 +16,14 @@ import ( // InitRegistry to init consul func InitRegistry(Port int) (registry.Registry, *registry.Info) { - r, err := consul.NewConsulRegisterWithConfig(&api.Config{Address: net.JoinHostPort( + r, err := consul.NewConsulRegister(net.JoinHostPort( config.GlobalConsulConfig.Host, - strconv.Itoa(config.GlobalConsulConfig.Port))}) + strconv.Itoa(config.GlobalConsulConfig.Port)), + consul.WithCheck(&api.AgentServiceCheck{ + Interval: consts.ConsulCheckInterval, + Timeout: consts.ConsulCheckTimeout, + DeregisterCriticalServiceAfter: consts.ConsulCheckDeregisterCriticalServiceAfter, + })) if err != nil { klog.Fatalf("new consul register failed: %s", err.Error()) }