handle ocis server start in separate routine

Author: amrita-shrestha

tests/ociswrapper/ocis/ocis.go

@@ -284,6 +284,7 @@ func RunOcisService(service string) {
 	}
 
 	cmd = exec.Command(config.Get("bin"), service, "server")
+	cmd.Env = append(os.Environ(), EnvConfigs...)
 
 	logs, err := cmd.StderrPipe()
 	if err != nil {
@@ -367,14 +368,12 @@ func StopService(service string) (bool, string) {
 		return false, fmt.Sprintf("Failed to find process with ID %d", pid)
 	}
 
-	// Send SIGINT to stop the command
 	err = process.Signal(syscall.SIGINT)
 	if err != nil {
 		log.Println(fmt.Sprintf("Failed to send signal: %v", err))
-		return false, fmt.Sprintf("Failed to stop service with ID %s", service)
+		return false, fmt.Sprintf("Failed to stop service with PID %d", pid)
 	}
 
-	// Wait for the service to stop
 	process.Wait()
 	delete(runningCommands, service)
 	return true, fmt.Sprintf("Service %s stopped successfully", service)

tests/ociswrapper/wrapper/handlers/handler.go

@@ -213,27 +213,31 @@ func OcisServiceHandler(res http.ResponseWriter, req *http.Request) {
 	serviceName := strings.TrimPrefix(req.URL.Path, "/services/")
 
 	if serviceName == "" {
-		sendResponse(res, http.StatusUnprocessableEntity, "Service name is required")
+		sendResponse(res, http.StatusUnprocessableEntity, "Service name not specified")
 		return
 	}
+
 	envVar := fmt.Sprintf("OCIS_EXCLUDE_RUN_SERVICES=%s", serviceName)
 	ocis.EnvConfigs = append(ocis.EnvConfigs, envVar)
 
 	if req.Method == http.MethodPost {
 		success, _ := ocis.Restart(ocis.EnvConfigs)
 		if success {
-			sendResponse(res, http.StatusOK, "oCIS configured successfully")
-			ocis.RunOcisService(serviceName)
+			sendResponse(res, http.StatusOK, fmt.Sprintf("oCIS restarted successfully without service %s", serviceName))
+
+			go ocis.RunOcisService(serviceName)
+
+			sendResponse(res, http.StatusOK, fmt.Sprintf("oCIS service %s started successfully", serviceName))
 			return
 		}
-		sendResponse(res, http.StatusInternalServerError, "Failed to restart oCIS with new configuration")
+
+		sendResponse(res, http.StatusInternalServerError, fmt.Sprintf("Failed to restart oCIS without service %s", serviceName))
 	}
 
 	if req.Method == http.MethodDelete {
-		// Attempt to stop the service
 		success, message := ocis.StopService(serviceName)
 		if success {
-			sendResponse(res, http.StatusOK, fmt.Sprintf("Service %s stopped successfully", serviceName))
+			sendResponse(res, http.StatusOK, fmt.Sprintf("oCIS service %s stopped successfully", serviceName))
 		} else {
 			sendResponse(res, http.StatusInternalServerError, message)
 		}