Redirect app stdout/stderr to logfile and enable passing of entrypoin…

…t args

cmd/root.go

@@ -17,7 +17,7 @@ var rootCmd = &cobra.Command{
 
 func Execute()  {
 	//rootCmd.SetArgs([]string{ "--root", "/home/lkmfwe/ctcli", "install", "/home/lkmfwe/Programming/FSharp/opbot/packaging/package/crafttalk-opbot-release-2021-03-22-6-commit.tar.gz" })
-	//rootCmd.SetArgs([]string{ "--root", "/home/lkmfwe/ctcli", "release-info" })
+	//rootCmd.SetArgs([]string{ "--root", "/home/lkmfwe/ctcli", "start" })
 
 	workDir, err := os.Getwd()
 	if err != nil {

cmd/stop.go

@@ -21,7 +21,10 @@ var stopCmd = &cobra.Command{
 			cmd.PrintErr(err)
 			return
 		}
-		domain.StopApps(rootDir)
+		if err := domain.StopApps(rootDir); err != nil {
+			cmd.PrintErr(err)
+			return
+		}
 	},
 }
 

domain/appConfig/app.go

@@ -17,6 +17,7 @@ type AppPackageConfig struct {
 	LogsFolder  string      `json:"logsFolder"`
 	Configs     []string    `json:"configs"`
 	Data 		[]string	`json:"data"`
+	Entrypoint  []string    `json:"entrypoint"`
 }
 
 func GetAppConfig(path string) (AppPackageConfig, error) {

domain/ctcliDir/paths.go

@@ -1,6 +1,10 @@
 package ctcliDir
 
-import "path"
+import (
+	"fmt"
+	"path"
+	"time"
+)
 
 const (
 	TempDir           = "tmp"
@@ -42,4 +46,15 @@ func GetAppDataDir(rootDir string, app string) string {
 
 func GetAppLogsDir(rootDir string, app string) string {
 	return path.Join(GetLogsDir(rootDir), app)
+}
+
+func GetAppStdoutLogFilePath(rootDir, app string) string {
+	return path.Join(GetAppLogsDir(rootDir, app), "stdout-stderr.log")
+}
+
+func GetNewArchiveStdoutLogFilePath(rootDir, app string) string {
+	return path.Join(
+		GetAppLogsDir(rootDir, app),
+		"stdout-stderr-arch",
+		fmt.Sprintf("%s.log", time.Now().UTC().Format(time.RFC3339)))
 }

domain/moving/loadRelease.go

@@ -14,6 +14,7 @@ import (
 	"io/ioutil"
 	"os"
 	"path"
+	"strings"
 )
 
 func CopyBinariesToRelease(rootDir string, packagePath string) error {
@@ -51,6 +52,15 @@ func configureRuncConfig(rootDir string, app string, config appConfig.AppPackage
 		return err
 	}
 
+	jsonValue.Get("process").Set("terminal", fastjson.MustParse(`false`))
+	if config.Entrypoint != nil {
+		resultValue := fastjson.MustParse("[]")
+		for i, cmdPart := range config.Entrypoint {
+			resultValue.SetArrayItem(i, fastjson.MustParse(`"` + strings.Replace(cmdPart, `"`, `\"`, -1) + `"`))
+		}
+		jsonValue.Get("process").Set("args", resultValue)
+	}
+
 	mountsMap := map[string]*fastjson.Value{}
 
 	for _, mount := range mounts {

domain/start.go

@@ -1,13 +1,15 @@
 package domain
 
 import (
+	"ctcli/domain/ctcliDir"
 	"ctcli/domain/release"
 	"ctcli/util"
 	"fmt"
 	"github.com/fatih/color"
 	"io/ioutil"
+	"os"
 	"os/exec"
-	"time"
+	"path"
 )
 
 func StartApps(rootDir string) error {
@@ -23,31 +25,57 @@ func StartApps(rootDir string) error {
 	for _, appFolder := range appFolders {
 		appName := appFolder.Name()
 		appPath := release.GetCurrentReleaseAppFolder(rootDir, appName)
-		if err := StartApp(appName, appPath, runcPath); err != nil {
+		if err := StartApp(rootDir, appName, appPath, runcPath); err != nil {
 			color.Red(fmt.Sprintf("error while starting %s app, error: %s", appName, err))
 		}
 	}
 	return nil
 }
 
-func StartApp(appName, appPath, runcPath string) error {
+
+
+func StartApp(rootDir, appName, appPath, runcPath string) error {
 	cmd := exec.Command(
 		runcPath,
-		"run",
+		"create",
 		"--bundle",
 		appPath,
 		appName,
 	)
 
-	if err := cmd.Start(); err != nil {
+	logFilePath := ctcliDir.GetAppStdoutLogFilePath(rootDir, appName)
+	_ = os.MkdirAll(path.Dir(logFilePath), os.ModePerm)
+	if util.PathExists(logFilePath) {
+		archiveLogFilePath := ctcliDir.GetNewArchiveStdoutLogFilePath(rootDir, appName)
+		_ = os.MkdirAll(path.Dir(archiveLogFilePath), os.ModePerm)
+		_ = os.Rename(logFilePath, archiveLogFilePath)
+	}
+
+	stdout, err := os.OpenFile(logFilePath, os.O_CREATE | os.O_RDWR, os.ModePerm)
+	if err != nil {
+		return err
+	}
+	cmd.Stdout = stdout
+	cmd.Stderr = stdout
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+
+	cmd = exec.Command(
+		runcPath,
+		"start",
+		appName,
+	)
+	defer stdout.Close()
+
+
+	if err := cmd.Run(); err != nil {
 		return err
 	}
-	// TODO Search how to do it without sleep
-	time.Sleep(4 * time.Second)
 
 	if err := cmd.Process.Release(); err != nil {
 		return err
 	}
-	color.Green(fmt.Sprintf("%s application started", appName))
+	color.Green(fmt.Sprintf("%s started", appName))
 	return nil
 }

domain/stop.go

@@ -7,6 +7,7 @@ import (
 	"github.com/fatih/color"
 	"io/ioutil"
 	"os/exec"
+	"time"
 )
 
 func StopApps(rootDir string) error {
@@ -33,6 +34,17 @@ func StopApp(appName, runcPath string) error {
 		runcPath,
 		"kill",
 		appName,
+		"SIGTERM",
+	)
+	if err := cmd.Run(); err != nil {
+		return err
+	}
+
+	time.Sleep(time.Second)
+	cmd = exec.Command(
+		runcPath,
+		"delete",
+		appName,
 	)
 	if err := cmd.Run(); err != nil {
 		return err