Fix: De-register node in case of failed services or db init

forsam-education · Jul 11, 2020 · dc6d371 · dc6d371
1 parent af8c7f6
commit dc6d371
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 35 deletions.
diff --git a/database/database-packr.go b/database/database-packr.go
diff --git a/database/initialize.go b/database/initialize.go
@@ -37,14 +37,14 @@ func generateFirstUser() error {
 	}
 
 	user := models.User{
-		Username: "Admin",
+		Username: "admin",
 		Password: string(password),
 		Email:    "root@localhost",
 	}
 
 	err = user.InsertG(boil.Infer())
 
-	utils.Logger.Info(fmt.Sprintf("First user credentials: Admin - %s", plainPassword), nil)
+	utils.Logger.Info(fmt.Sprintf("First user credentials: admin - %s", plainPassword), nil)
 
 	return err
 }

diff --git a/orchestrator/starter.go b/orchestrator/starter.go
@@ -46,11 +46,13 @@ func StartOrchestrator() {
 	err = handleDatabaseStartup()
 	if err != nil {
 		utils.Logger.StdErrorCritical(err, nil)
+		_ = state.Manager.RemoveNode()
 		os.Exit(1)
 	}
 
 	if err = proxy.LoadServices(); err != nil {
 		utils.Logger.StdErrorCritical(err, nil)
+		_ = state.Manager.RemoveNode()
 		os.Exit(1)
 	}
 

diff --git a/packrd/packed-packr.go b/packrd/packed-packr.go
diff --git a/proxy/middlewares.go b/proxy/middlewares.go
@@ -1,26 +1,14 @@
 package proxy
 
 import (
-	"github.com/forsam-education/cerberus/state"
 	"github.com/gofrs/uuid"
 	"net/http"
 )
 
 var middlewares = []func(next http.Handler) http.Handler{
-	connectionCounter,
 	injectRequestID,
 }
 
-func connectionCounter(next http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		err := state.Manager.AddRequest()
-		next.ServeHTTP(w, r)
-		if err == nil {
-			_ = state.Manager.RemoveRequest()
-		}
-	})
-}
-
 func injectRequestID(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		requestUUID, err := uuid.NewV4()

diff --git a/state/manager.go b/state/manager.go
@@ -30,26 +30,6 @@ type manager struct {
 	IsLeaderNode          bool
 }
 
-// GetCurrentRequestsCount fetches the current proxy request from the shared manager.
-func (manager *manager) GetCurrentRequestsCount() (int, error) {
-	return manager.RedisClient.Get(CurrentRequestsCount).Int()
-}
-
-// AddRequest adds a request to the current request count in the shared manager.
-func (manager *manager) AddRequest() error {
-	return manager.RedisClient.Incr(CurrentRequestsCount).Err()
-}
-
-// RemoveRequest removes a request from the current request count in the shared manager.
-func (manager *manager) RemoveRequest() error {
-	return manager.RedisClient.Decr(CurrentRequestsCount).Err()
-}
-
-// GetAndResetRequestCount performs a getset on the manager to get the request count and reset it to 0 in an atomic operation.
-func (manager *manager) GetAndResetRequestCount() (int, error) {
-	return manager.RedisClient.GetSet(CurrentRequestsCount, 0).Int()
-}
-
 // GetCurrentNodesCount fetches the cerberus nodes from the shared manager.
 func (manager *manager) GetCurrentNodesCount() (int, error) {
 	return manager.RedisClient.Get(CurrentNodesCount).Int()
@@ -161,7 +141,7 @@ func (manager *manager) AddService(service *models.Service) error {
 		return err
 	}
 
-	return manager.RedisClient.Set(service.ServicePath, string(serialized), viper.GetDuration(utils.RedisServerServiceTTL)*time.Minute).Err()
+	return manager.RedisClient.Set(service.ServicePath, string(serialized), viper.GetDuration(utils.RedisServerServiceTTL)*time.Second).Err()
 }
 
 func (manager *manager) RemoveService(service *models.Service) error {