CLOUD-67912 check salt api and master as well when lauching the services

Author: Krisztian Horvath

saltboot/salt.go

@@ -136,19 +136,9 @@ func SaltMinionRunRequestHandler(w http.ResponseWriter, req *http.Request) {
 		resp.WriteHttp(w)
 		return
 	}
-	psOutput, err := ExecCmd("ps", "aux")
-	alreadyRunning := strings.Contains(psOutput, "salt-minion")
 
-	if alreadyRunning {
-		log.Printf("[SaltMinionRunRequestHandler] salt-minion is already running %s", psOutput)
-		resp = model.Response{StatusCode: http.StatusOK, Status: "salt-minion already running"}
-		resp.WriteHttp(w)
-		return
-	} else {
-		log.Printf("[SaltMinionRunRequestHandler] salt-minion is not running and will be started")
-	}
-	resp, _ = LaunchService("salt-minion")
 	log.Printf("[SaltMinionRunRequestHandler] execute salt-minion run request")
+	resp, _ = LaunchService("salt-minion")
 	resp.WriteHttp(w)
 }
 
@@ -186,21 +176,35 @@ func SaltServerRunRequestHandler(w http.ResponseWriter, req *http.Request) {
 		log.Printf("[ERROR] while hostfile update: %s", err)
 	}
 
+	var responses []model.Response
+
 	resp, err := CreateUser(saltMaster)
-	resp.WriteHttp(w)
 	if err != nil {
+		resp.WriteHttp(w)
 		return
 	}
+	responses = append(responses, resp)
 
 	resp, err = LaunchService("salt-master")
-	resp.WriteHttp(w)
+	if err != nil {
+		resp.WriteHttp(w)
+		return
+	}
+	responses = append(responses, resp)
 
+	resp, err = LaunchService("salt-api")
 	if err != nil {
+		resp.WriteHttp(w)
 		return
 	}
+	responses = append(responses, resp)
 
-	resp, _ = LaunchService("salt-api")
-	resp.WriteHttp(w)
+	var message string
+	for _, r := range responses {
+		message += r.Status + "; "
+	}
+	finalResponse := model.Response{Status: message, StatusCode: http.StatusOK}
+	finalResponse.WriteHttp(w)
 }
 
 func SaltServerStopRequestHandler(w http.ResponseWriter, req *http.Request) {

saltboot/service.go

@@ -4,9 +4,22 @@ import (
 	"net/http"
 
 	"github.com/sequenceiq/salt-bootstrap/saltboot/model"
+	"log"
+	"strings"
 )
 
 func LaunchService(service string) (resp model.Response, err error) {
+	log.Printf("[LaunchService] check if service: %s is running", service)
+	psOutput, _ := ExecCmd("ps", "aux")
+	alreadyRunning := strings.Contains(psOutput, service)
+
+	if alreadyRunning {
+		log.Printf("[LaunchService] %s is already running %s", service, psOutput)
+		return model.Response{StatusCode: http.StatusOK, Status: service + " is already running"}, nil
+	} else {
+		log.Printf("[LaunchService] %s is not running and will be started", service)
+	}
+
 	return SetServiceState(service, true)
 }
 

saltboot/user.go

@@ -27,7 +27,7 @@ func randStringRunes(n int) string {
 func CreateUser(saltMaster SaltMaster) (resp model.Response, err error) {
 	log.Printf("[CreateUser] execute salt run request")
 
-	result := "OK"
+	result := "Create user: OK"
 
 	//saltUser, _ := user.Lookup(SALT_USER) //requires cgo
 	_, err = ExecCmd("grep", SALT_USER, "/etc/passwd")