feat: add service check

CyanAsterisk · Apr 5, 2023 · 9f1d56c · 9f1d56c
1 parent 53c8cb2
commit 9f1d56c
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 10 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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())
 	}