combine two function in one

Author: amrita-shrestha

tests/ociswrapper/ocis/ocis.go

@@ -321,20 +321,17 @@ func StopService(service string) (bool, string) {
 		return false, fmt.Sprintf("Failed to stop service with process id %d", pid)
 	}
 
-	// service takes 30sec time to completely shutdown
-	success := WaitForServiceDown(service)
+	success := WaitForServiceStatus(service, false)
 	if !success {
 		StopService(service)
 	}
 
 	delete(runningServices, service)
-	log.Println(fmt.Sprintf("oCIS service %s has been stopped successfully", service))
 
 	return true, fmt.Sprintf("Service %s stopped successfully", service)
 }
 
-// wait until the port for a given service is listening
-func WaitForService(service string) bool {
+func WaitForServiceStatus(service string, waitForUp bool) bool {
 	overallTimeout := time.After(30 * time.Second)
 	ticker := time.NewTicker(2 * time.Second)
 	defer ticker.Stop()
@@ -344,60 +341,35 @@ func WaitForService(service string) bool {
 	for {
 		select {
 		case <-overallTimeout:
-			// Timeout occurred while waiting for the service to be available
-			log.Println(fmt.Errorf("timeout: %s service did not become available within 30 seconds", service).Error())
-			return false
-		case <-ticker.C:
-			// Retry if the service is not in `runningServices`
-			if _, exists := runningServices[service]; !exists {
-				log.Println(fmt.Sprintf("Service %s not found in running services. Retrying...\n", service))
-				continue
+			status := "available"
+			if !waitForUp {
+				status = "shut down"
 			}
-
-			address := fmt.Sprintf(":%d", port)
-			// Try to connect to the port
-			conn, err := net.DialTimeout("tcp", address, 1*time.Second)
-			if err == nil {
-				_ = conn.Close()
-				log.Println(fmt.Sprintf("%s service is ready to listen port %d", service, port))
-				return true
-			}
-			log.Println(fmt.Sprintf("%s service is not ready on port %v. %v\n", service, port, err))
-		}
-	}
-}
-
-// wwait until service completely down
-func WaitForServiceDown(service string) bool {
-	overallTimeout := time.After(30 * time.Second)
-	ticker := time.NewTicker(2 * time.Second)
-	defer ticker.Stop()
-
-	port := config.GetServiceDebugPort(service)
-
-	for {
-		select {
-		case <-overallTimeout:
-			// Timeout occurred while waiting for the service to be available
-			log.Println(fmt.Errorf("timeout: %s service did not shut down within 30 seconds", service).Error())
+			log.Println(fmt.Errorf("Timeout: %s service did not %s within 30 seconds", service, status).Error())
 			return false
 		case <-ticker.C:
-			// Retry if the service is not in `runningServices`
 			if _, exists := runningServices[service]; !exists {
-				log.Println(fmt.Sprintf("Service %s not found in running services. Retrying...\n", service))
+				log.Println(fmt.Sprintf("Service %s not found in running services. Retrying...", service))
 				continue
 			}
 
 			address := fmt.Sprintf(":%d", port)
-			// Try to connect to the port
 			conn, err := net.DialTimeout("tcp", address, 1*time.Second)
-			if err != nil {
-				log.Println(fmt.Sprintf("%s service port %d is no longer reachable", service, port))
-				return true
+			if waitForUp {
+				if err == nil {
+					_ = conn.Close()
+					log.Println(fmt.Sprintf("%s service is ready to listen on port %d", service, port))
+					return true
+				}
+				log.Println(fmt.Sprintf("%s service is not ready on port %d. %v", service, port, err))
+			} else {
+				if err != nil {
+					log.Println(fmt.Sprintf("%s service port %d is no longer reachable", service, port))
+					return true
+				}
+				_ = conn.Close()
+				log.Println(fmt.Sprintf("%s service port %d is still active. Retrying...", service, port))
 			}
-			_ = conn.Close()
-			log.Println(fmt.Sprintf("%s service port %d is still active. Retrying...", service, port))
 		}
 	}
 }
-

tests/ociswrapper/wrapper/handlers/handler.go

@@ -240,7 +240,7 @@ func OcisServiceHandler(res http.ResponseWriter, req *http.Request) {
 			common.Wg.Add(1)
 			go ocis.StartService(serviceName, serviceEnvMap)
 
-			success := ocis.WaitForService(serviceName)
+			success := ocis.WaitForServiceStatus(serviceName, true)
 			if success {
 				log.Println(fmt.Sprintf("Found Port for %s...", serviceName))
 				sendResponse(res, http.StatusOK, fmt.Sprintf("oCIS service %s started successfully", serviceName))
@@ -260,5 +260,5 @@ func OcisServiceHandler(res http.ResponseWriter, req *http.Request) {
 		}
 		return
 	}
-	sendResponse(res, http.StatusMethodNotAllowed, "Invalid method requested")
+	sendResponse(res, http.StatusMethodNotAllowed, "Method Not Allowed")
 }