Merge pull request #41 from MZC-CSC/develop

Reflect OS exit code and Add logs command

cmd/docker/log.go

@@ -0,0 +1,25 @@
+package docker
+
+import (
+	"fmt"
+
+	"github.com/cm-mayfly/cm-mayfly/common"
+	"github.com/spf13/cobra"
+)
+
+// pullCmd represents the pull command
+var logCmd = &cobra.Command{
+	Use:   "logs",
+	Short: "View output from Cloud-Migrator system containers",
+	Long:  `View output from Cloud-Migrator system containers`,
+	Run: func(cmd *cobra.Command, args []string) {
+		fmt.Println("\n[View output from Cloud-Migrator system containers.]")
+		cmdStr := fmt.Sprintf("COMPOSE_PROJECT_NAME=%s docker compose -f %s logs --follow %s", ProjectName, DockerFilePath, ServiceName)
+		//fmt.Println(cmdStr)
+		common.SysCall(cmdStr)
+	},
+}
+
+func init() {
+	dockerCmd.AddCommand(logCmd)
+}

cmd/rest/get.go

@@ -2,6 +2,7 @@ package rest
 
 import (
 	"fmt"
+	"os"
 
 	"github.com/spf13/cobra"
 )
@@ -35,11 +36,13 @@ var restGetCmd = &cobra.Command{
 		resp, err := req.Get(url)
 		if err != nil {
 			fmt.Println("Error:", err)
-			return
+			os.Exit(1)
+			//return
 		}
 
 		// 응답 출력
 		ProcessResultInfo(resp)
+		ProcessOsExitcode(resp) // for docker compose healthy check
 	},
 }
 

cmd/rest/root.go

@@ -6,6 +6,7 @@ package rest
 import (
 	"fmt"
 	"io/ioutil"
+	"os"
 
 	"strings"
 
@@ -71,6 +72,9 @@ var restCmd = &cobra.Command{
 		//fmt.Println("============ REST 메인 호출됨!!!!  ")
 		fmt.Println(cmd.Help()) // root.go에서는 도움말만 출력 함.
 	},
+
+	// PersistentPostRun: func(cmd *cobra.Command, args []string) {
+	// },
 }
 
 func SetBasicAuth() {
@@ -164,6 +168,18 @@ func ProcessResultInfo(resp *resty.Response) {
 	}
 }
 
+// Handles OS exit code for docker-compose's healthy checks.
+func ProcessOsExitcode(resp *resty.Response) {
+	// Checking response status codes
+	if resp.StatusCode() != 200 {
+		if isVerbose {
+			fmt.Fprintf(os.Stderr, "Received non-200 response: %d\n", resp.StatusCode())
+		}
+		exitCode := resp.StatusCode() / 100 // First digit (2xx, 3xx, 4xx, 5xx)
+		os.Exit(exitCode)                   // One of 0, 3, 4, or 5
+	}
+}
+
 func ShowTraceInfo(resp *resty.Response) {
 	// Explore trace info
 	fmt.Println("Request Trace Info:")