Merge branch 'master' of https://repositories.action2quare.com/ayo/houston

.gitignore

@@ -4,3 +4,4 @@ houston
 houston.zip
 config.json
 .vscode/
+/data

client/client.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -35,6 +36,23 @@ type runcommand struct {
 	Exec          string   `json:"exec"`
 	Args          []string `json:"args"`
 	Version       string   `json:"version"`
+	AutoRestart   bool     `json:"auto_restart"`
+	OutputLogFile string   `json:"logfile"`
+}
+
+type easyruncommand runcommand
+
+func (t *runcommand) UnmarshalJSON(b []byte) error {
+	easy := easyruncommand{
+		Version:     "latest",
+		AutoRestart: true,
+	}
+	if err := json.Unmarshal(b, &easy); err != nil {
+		return err
+	}
+
+	*t = runcommand(easy)
+	return nil
 }
 
 type clientConfig struct {
@@ -79,8 +97,11 @@ type procmeta struct {
 	args       []string
 	version    string
 	verpath    string
+	recover    bool
 	state      int32
 	stdin      io.WriteCloser
+	logfile    string
+	keepLatest bool
 }
 
 func (pm *procmeta) isState(s protos.ProcessState) bool {
@@ -113,6 +134,13 @@ type houstonClient struct {
 }
 
 func unmarshal[T any](val *T, src map[string]string) {
+	defer func() {
+		r := recover()
+		if r != nil {
+			logger.Error(r)
+		}
+	}()
+
 	argval := reflect.ValueOf(val)
 	for i := 0; i < argval.Elem().Type().NumField(); i++ {
 		if !argval.Elem().Type().Field(i).IsExported() {
@@ -125,6 +153,9 @@ func unmarshal[T any](val *T, src map[string]string) {
 		} else if argval.Elem().Field(i).Kind() == reflect.Array || argval.Elem().Field(i).Kind() == reflect.Slice {
 			conv := strings.Split(arg, "\n")
 			argval.Elem().Field(i).Set(reflect.ValueOf(conv))
+		} else if argval.Elem().Field(i).Kind() == reflect.Bool {
+			bv, _ := strconv.ParseBool(arg)
+			argval.Elem().Field(i).SetBool(bv)
 		} else {
 			argval.Elem().Field(i).SetString(arg)
 		}
@@ -332,6 +363,10 @@ func NewClient(standalone bool) (HoustonClient, error) {
 								proc.cmd.Process.Release()
 
 								if proc.isState(protos.ProcessState_Restart) {
+									if proc.keepLatest {
+										proc.version = "latest"
+									}
+
 									if err := hc.startChildProcess(&shared.StartProcessRequest{
 										Version: proc.version,
 										Name:    proc.name,
@@ -352,10 +387,14 @@ func NewClient(standalone bool) (HoustonClient, error) {
 				op.Refresh(ctx, hc.makeOperationQueryRequest())
 
 			case resp := <-operationChan:
+				logger.Println("houton query operation :", resp.Operation)
+
 				switch shared.Operation(resp.Operation) {
 				case shared.Deploy:
 					var dr shared.DeployRequest
 					unmarshal(&dr, resp.Args)
+					logger.Println("args :", dr)
+
 					if dr.Name == myname {
 						if srcdir, replacer, err := hc.prepareUpdateSelf(&dr); err == nil {
 							args := []string{
@@ -411,6 +450,8 @@ func NewClient(standalone bool) (HoustonClient, error) {
 				case shared.Withdraw:
 					var wr shared.WithdrawRequest
 					unmarshal(&wr, resp.Args)
+					logger.Println("args :", wr)
+
 					err := hc.withdraw(&wr)
 					if err == nil {
 						prog := gatherDeployedPrograms(hc.config.StorageRoot, wr.Name)
@@ -427,6 +468,8 @@ func NewClient(standalone bool) (HoustonClient, error) {
 				case shared.Start:
 					var sr shared.StartProcessRequest
 					unmarshal(&sr, resp.Args)
+					logger.Println("args :", sr)
+
 					if err := hc.startChildProcess(&sr); err != nil {
 						logger.ErrorWithCallStack(err)
 					} else {
@@ -436,6 +479,8 @@ func NewClient(standalone bool) (HoustonClient, error) {
 				case shared.Stop:
 					var sr shared.StopProcessRequest
 					unmarshal(&sr, resp.Args)
+					logger.Println("args :", sr)
+
 					if err := hc.stopChildProcess(&sr, op); err != nil {
 						logger.Println(err)
 					}
@@ -443,6 +488,8 @@ func NewClient(standalone bool) (HoustonClient, error) {
 				case shared.Restart:
 					var rr shared.RestartProcessRequest
 					unmarshal(&rr, resp.Args)
+					logger.Println("args :", rr)
+
 					if err := hc.restartChildProcess(&rr, op); err != nil {
 						logger.Println(err)
 					}
@@ -450,6 +497,8 @@ func NewClient(standalone bool) (HoustonClient, error) {
 				case shared.Upload:
 					var ur shared.UploadRequest
 					unmarshal(&ur, resp.Args)
+					logger.Println("args :", ur)
+
 					if err := hc.uploadFiles(&ur); err != nil {
 						logger.Println(err)
 					}
@@ -459,19 +508,44 @@ func NewClient(standalone bool) (HoustonClient, error) {
 					id64, _ := strconv.ParseInt(idstr, 10, 0)
 					id := int32(id64)
 
+					var found *procmeta
 					hc.childProcs = gocommon.ShrinkSlice(hc.childProcs, func(e *procmeta) bool {
 						if e.id == id {
-							e.cmd.Wait()
-							e.cmd.Process.Release()
+							found = e
 							return true
 						}
 						return false
 					})
 
+					if found != nil {
+						found.cmd.Wait()
+						found.cmd.Process.Release()
+
+						if found.recover {
+							time.Sleep(time.Second)
+							sr := shared.StartProcessRequest{
+								Name:          found.name,
+								Version:       found.version,
+								Args:          found.args,
+								AutoRestart:   found.recover,
+								OutputLogFile: found.logfile,
+							}
+
+							if err := hc.startChildProcess(&sr); err != nil {
+								logger.Println("startChildProcess failed by autorun :", err)
+								logger.ErrorWithCallStack(err)
+							} else {
+								logger.Println("recover success :", sr)
+							}
+						}
+					}
+
+					if op != nil {
 						op.Refresh(context.Background(), hc.makeOperationQueryRequest())
 					}
 				}
 			}
+		}
 	}()
 
 	hc.shutdownFunc = func() {
@@ -544,6 +618,8 @@ func (hc *houstonClient) Start() {
 					Name:          service,
 					Version:       cmd.Version,
 					Args:          append([]string{cmd.Exec}, cmd.Args...),
+					AutoRestart:   cmd.AutoRestart,
+					OutputLogFile: cmd.OutputLogFile,
 				}
 
 				if err := hc.startChildProcess(&sr); err != nil {

client/operation.go

@@ -15,7 +15,6 @@ import (
 	"path"
 	"path/filepath"
 	"regexp"
-	"sort"
 	"strconv"
 	"strings"
 	"syscall"
@@ -79,30 +78,34 @@ func (hc *houstonClient) uploadZipLogFile(zipFile string, name string, version s
 	return nil
 }
 
-func zipLogFiles(storageRoot string, req *shared.UploadRequest) (string, []string, error) {
-	root := path.Join(storageRoot, req.Name, req.Version)
-	matches, err := filepath.Glob(path.Join(root, req.Filter))
+func findMatchFiles(storageRoot, name, version, filter string) (string, []string) {
+	root := path.Join(storageRoot, name, version)
+	matches, err := filepath.Glob(path.Join(root, filter))
 	if err != nil {
-		return "", nil, err
+		return "", nil
 	}
 
 	if len(matches) == 0 {
-		return "", nil, nil
+		return "", nil
 	}
 
-	for i, file := range matches {
+	root = path.Join(root, path.Dir(filter))
+	out := make([]string, 0, len(matches))
+	for _, file := range matches {
 		file = filepath.ToSlash(file)
-		matches[i] = file
+		if file == root {
+			continue
 		}
 
-	root = path.Join(root, path.Dir(req.Filter))
-	hostname, _ := os.Hostname()
-	zipFileName := path.Join(os.TempDir(), hostname+"_"+path.Base(filepath.ToSlash(matches[0]))) + ".zip"
-	os.Remove(zipFileName)
-	f, err := os.OpenFile(zipFileName, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
+		out = append(out, file)
+	}
+	return root, out
+}
 
+func zipCompressFiles(root string, matches []string) (string, error) {
+	f, err := os.CreateTemp(os.TempDir(), "*.zip")
 	if err != nil {
-		return "", nil, err
+		return "", err
 	}
 	defer f.Close()
 
@@ -111,10 +114,6 @@ func zipLogFiles(storageRoot string, req *shared.UploadRequest) (string, []strin
 
 	oldestFile := ""
 	for i, file := range matches {
-		if file == root {
-			continue
-		}
-
 		if fi, err := os.Lstat(file); err == nil {
 			if (fi.Mode() & os.ModeSymlink) == os.ModeSymlink {
 				matches[i] = ""
@@ -129,21 +128,21 @@ func zipLogFiles(storageRoot string, req *shared.UploadRequest) (string, []strin
 		relative := file[len(root)+1:]
 		fw, err := w.Create(relative)
 		if err != nil {
-			return "", nil, err
+			return "", err
 		}
 
 		src, err := os.Open(file)
 		if err != nil {
-			return "", nil, err
+			return "", err
 		}
 		defer src.Close()
 
 		if _, err = io.Copy(fw, src); err != nil {
-			return "", nil, err
+			return "", err
 		}
 	}
 
-	return f.Name(), matches, nil
+	return f.Name(), nil
 }
 
 func prepareProcessLaunch(storageRoot string, req *shared.StartProcessRequest) (*procmeta, error) {
@@ -151,6 +150,7 @@ func prepareProcessLaunch(storageRoot string, req *shared.StartProcessRequest) (
 		return nil, errors.New("args is empty")
 	}
 
+	foundVersion := req.Version
 	if req.Version == "latest" {
 		entries, err := os.ReadDir(path.Join(storageRoot, req.Name))
 		if err != nil {
@@ -176,11 +176,11 @@ func prepareProcessLaunch(storageRoot string, req *shared.StartProcessRequest) (
 		}
 
 		if len(latestVersion) > 0 {
-			req.Version = latestVersion
+			foundVersion = latestVersion
 		}
 	}
 
-	verpath := path.Join(storageRoot, req.Name, req.Version)
+	verpath := path.Join(storageRoot, req.Name, foundVersion)
 	fi, err := os.Stat(verpath)
 	if err != nil {
 		return nil, err
@@ -215,41 +215,18 @@ func prepareProcessLaunch(storageRoot string, req *shared.StartProcessRequest) (
 			cmd:        cmd,
 			name:       req.Name,
 			args:       req.Args,
-			version: req.Version,
+			version:    foundVersion,
+			recover:    req.AutoRestart,
 			verpath:    verpath,
 			state:      int32(protos.ProcessState_Stopped),
 			stdin:      stdin,
+			logfile:    req.OutputLogFile,
+			keepLatest: req.Version == "latest",
 		}, nil
 	}
 	return nil, errors.New("not found")
 }
 
-func makeLogFilePrefix(meta *procmeta, index int) string {
-	now := time.Now().UTC()
-	ext := path.Ext(meta.args[0])
-	nameonly := path.Base(filepath.ToSlash(meta.args[0]))
-	if len(ext) > 0 {
-		nameonly = nameonly[:len(nameonly)-len(ext)]
-	}
-	ts := now.Format("2006-01-02T15-04-05")
-	if index == 0 {
-
-		return path.Join(meta.verpath, "logs", fmt.Sprintf("%s_%s", nameonly, ts))
-	}
-
-	return path.Join(meta.verpath, "logs", fmt.Sprintf("%s_%d_%s", nameonly, index, ts))
-}
-
-func evaluateExpression(expression string, params map[string]any) (any, error) {
-	expression = strings.TrimSpace(expression)
-	expr, err := govaluate.NewEvaluableExpression(expression)
-	if err != nil {
-		return 0, err
-	}
-
-	return expr.Evaluate(params)
-}
-
 func evaluateArgs(args []string, params map[string]any) ([]string, error) {
 	re := regexp.MustCompile(`\$\(\((.*?)\)\)`)
 
@@ -307,17 +284,27 @@ func (hc *houstonClient) launch(meta *procmeta) error {
 	if err != nil {
 		return err
 	}
-
-	err = os.MkdirAll(path.Join(meta.verpath, "logs"), 0775)
+	stderr, err := meta.cmd.StderrPipe()
 	if err != nil {
 		return err
 	}
 
-	stdReader := func(jobName string, r io.ReadCloser, index int) {
+	logfolder := path.Join(meta.verpath, "logs")
+	err = os.MkdirAll(logfolder, 0775)
+	if err != nil {
+		return err
+	}
+
+	stdReader := func(jobName string, r io.ReadCloser, index int, logfilePath string) {
 		defer func() {
-			reco := recover()
-			if reco != nil {
-				logger.Println(reco)
+			logger.Println("stdReader is terminated :", meta.name)
+			if meta.isState(protos.ProcessState_Running) {
+				hc.operationChan <- &protos.OperationQueryResponse{
+					Operation: string(shared.Exception),
+					Args: map[string]string{
+						"id": fmt.Sprintf("%d", meta.id),
+					},
+				}
 			}
 		}()
 
@@ -331,90 +318,35 @@ func (hc *houstonClient) launch(meta *procmeta) error {
 			hc.siblingProcIndex[key] = runningFlags
 		}()
 
-		defer r.Close()
-
-		reader := bufio.NewReader(r)
-		thisFileSize := 0
-		logFileIndex := 0
-
-		var logWriter func([]byte)
-		if *logger.UseLogFile {
-			logFileNamePrefix := makeLogFilePrefix(meta, index)
-			logFileName := fmt.Sprintf("%s_%d.log", logFileNamePrefix, logFileIndex)
-			targetFile, err := os.Create(logFileName)
-			if err != nil {
-				logger.Println("failed to create log file :", logFileName)
-				return
-			}
-
-			exef, _ := os.Executable()
-			var linkPath string
-			if index == 0 {
-				linkPath = path.Join(path.Dir(exef), path.Dir(logFileName), meta.name+".log")
-			} else {
-				linkPath = path.Join(path.Dir(exef), path.Dir(logFileName), fmt.Sprintf("%s_%d.log", meta.name, index))
-			}
-
-			os.Remove(linkPath)
-			os.Symlink(path.Base(filepath.ToSlash(targetFile.Name())), linkPath)
-
 		defer func() {
-				if targetFile != nil {
-					targetFile.Close()
-				}
-			}()
-
-			logWriter = func(buff []byte) {
-				for written := 0; written < len(buff); {
-					n, err := targetFile.Write(buff)
-					if err != nil {
-						logger.Println("write log file failed :", logFileName, err)
-						break
-					} else {
-						written += n
-						thisFileSize += n
-					}
+			reco := recover()
+			if reco != nil {
+				logger.Println(reco)
 			}
 
-				if thisFileSize > 5*1024*1024 {
-					logFileIndex++
-					logFileName = fmt.Sprintf("%s_%d.log", logFileNamePrefix, logFileIndex)
-					nextTargetFile, err := os.Create(logFileName)
-					if err != nil {
-						logger.Println("failed to create log file :", logFileName)
-					} else {
-						targetFile.Close()
-						targetFile = nextTargetFile
-						os.Remove(linkPath)
-						os.Symlink(path.Base(filepath.ToSlash(targetFile.Name())), linkPath)
-						thisFileSize = 0
-					}
-				}
-			}
-		} else {
-			logWriter = func(buff []byte) {
-				os.Stdout.Write(buff)
-			}
-		}
-
-		readingMetric := false
-		var metricBuffer []byte
-		defer func() {
-			logger.Println("stdReader is terminated :", meta.name)
-			if meta.isState(protos.ProcessState_Running) {
-				hc.operationChan <- &protos.OperationQueryResponse{
-					Operation: string(shared.Exception),
-					Args: map[string]string{
-						"id": fmt.Sprintf("%d", meta.id),
-					},
-				}
-			}
+			r.Close()
 		}()
 
 		metricExporter := metric.NewPrometheusExport(hc.config.MetricNamespace)
 		defer metricExporter.Shutdown()
 
+		total := 0
+		hn, _ := os.Hostname()
+		var targetFile *os.File
+		ext := path.Ext(logfilePath)
+		head := logfilePath[:len(logfilePath)-len(ext)]
+		reader := bufio.NewReader(r)
+		readingMetric := false
+		ext = "." + hn + ext
+
+		var metricBuffer []byte
+
 		for {
+			if targetFile == nil {
+				currentFile := head + time.Now().UTC().Format(".2006-01-02.150405") + ext
+				targetFile, _ = os.OpenFile(currentFile, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0666)
+			}
+
 			buff, err := reader.ReadBytes('\n')
 			if err != nil {
 				logger.Println("ReadBytes at stdReader return err :", err, meta.name)
@@ -458,11 +390,79 @@ func (hc *houstonClient) launch(meta *procmeta) error {
 
 					metricBuffer = metricBuffer[:0]
 				}
+			} else if targetFile != nil && len(buff) > 0 {
+				for written := 0; written < len(buff); {
+					n, err := targetFile.Write(buff[written:])
+					if err != nil {
+						logger.Println("write log file failed :", logfilePath, err)
+						break
+					} else {
+						written += n
+					}
+				}
+				total += len(buff)
 
-				continue
+				if total > 1024*1024 {
+					total = 0
+					targetFile.Close()
+					targetFile = nil
+
+					hc.uploadProcFiles(meta, "logs/*"+ext, true)
+				}
+			}
+		}
 	}
 
-			logWriter(buff)
+	errReader := func(r io.ReadCloser, logfilePath string) {
+		defer func() {
+			reco := recover()
+			if reco != nil {
+				logger.Println(reco)
+			}
+		}()
+		defer r.Close()
+
+		total := 0
+		hn, _ := os.Hostname()
+
+		var targetFile *os.File
+		ext := path.Ext(logfilePath)
+		head := logfilePath[:len(logfilePath)-len(ext)]
+		reader := bufio.NewReader(r)
+		ext = "." + hn + ext
+
+		for {
+			if targetFile == nil {
+				currentFile := head + time.Now().UTC().Format(".2006-01-02.150405") + ext
+				targetFile, _ = os.OpenFile(currentFile, os.O_CREATE|os.O_APPEND|os.O_WRONLY, 0666)
+			}
+
+			buff, errRead := reader.ReadBytes('\n')
+			if errRead != nil {
+				logger.Println("ReadBytes at stdReader return err :", err, meta.name)
+				break
+			}
+
+			if targetFile != nil && len(buff) > 0 {
+				for written := 0; written < len(buff); {
+					n, err := targetFile.Write(buff[written:])
+					if err != nil {
+						logger.Println("write log file failed :", logfilePath, err)
+						break
+					} else {
+						written += n
+					}
+				}
+				total += len(buff)
+
+				if total > 1024*1024 {
+					total = 0
+					targetFile.Close()
+					targetFile = nil
+
+					hc.uploadProcFiles(meta, "logs/*"+ext, true)
+				}
+			}
 		}
 	}
 
@@ -486,14 +486,43 @@ func (hc *houstonClient) launch(meta *procmeta) error {
 		}
 	}
 
-	go stdReader(meta.name, stdout, index)
+	// 자체 환경 변수
+	customEnv := map[string]string{
+		"HOUSTON_SIBLIING_INDEX": fmt.Sprintf("%d", index),
+		"HOUSTON_PROC_TIMESTAMP": time.Now().UTC().Format("2006-01-02T15-04-05"),
+	}
 
-	meta.cmd.Env = append(os.Environ(), fmt.Sprintf("HOUSTON_SIBLIING_INDEX=%d", index))
+	// 프로세스 환경 변수에 반영
+	meta.cmd.Env = os.Environ()
+	for k, v := range customEnv {
+		meta.cmd.Env = append(meta.cmd.Env, fmt.Sprintf("%s=%s", k, v))
+	}
+
+	// argument 표현식 계산
 	meta.cmd.Args, err = evaluateArgs(meta.cmd.Args, parseEnv(meta.cmd.Env))
 	if err != nil {
 		logger.Println("evaluateArgs failed :", err)
 		return err
 	}
+
+	// 로그파일에 환경변수 적용
+	evalfile := os.Expand(meta.logfile, func(n string) string {
+		v := os.Getenv(n)
+		if len(v) == 0 {
+			return customEnv[n]
+		}
+		return v
+	})
+
+	if len(evalfile) > 0 {
+		evalfile = path.Join(logfolder, evalfile)
+	} else {
+		evalfile = path.Join(logfolder, path.Base(meta.cmd.Args[0]))
+	}
+
+	go stdReader(meta.name, stdout, index, evalfile+".log")
+	go errReader(stderr, evalfile+".err")
+
 	logger.Println("startChildProcess :", meta.cmd.Args)
 
 	err = meta.cmd.Start()
@@ -605,54 +634,52 @@ func (hc *houstonClient) restartChildProcess(req *shared.RestartProcessRequest,
 	return nil
 }
 
-func (hc *houstonClient) uploadFiles(req *shared.UploadRequest) error {
-	logger.Println("uploadFiles req :", *req)
-	for _, child := range hc.childProcs {
-		if child.version == req.Version && child.name == req.Name {
+func (hc *houstonClient) uploadProcFiles(child *procmeta, filter string, deleteAfterUpload bool) {
 	logger.Println("uploadFiles found :", child.version, child.name)
+	root, matches := findMatchFiles(hc.config.StorageRoot, child.name, child.version, filter)
 
-			go func() {
-				zipFile, srcFiles, err := zipLogFiles(hc.config.StorageRoot, req)
-				if err == nil && len(zipFile) > 0 && len(srcFiles) > 0 {
+	go func(deleteAfterUpload bool, root string, matches []string) {
+		zipFile, err := zipCompressFiles(root, matches)
+		if err == nil && len(zipFile) > 0 {
 			if err = hc.uploadZipLogFile(zipFile, child.name, child.version); err == nil {
-						// 마지막거 빼고 삭제
-						if req.DeleteAfterUploaded == "true" {
-							for i := 0; i < len(srcFiles)-1; i++ {
-								os.Remove(srcFiles[i])
-							}
-						} else {
-							sort.StringSlice(srcFiles).Sort()
-
-							for i := 0; i < len(srcFiles)-1; i++ {
-								if len(srcFiles[i]) > 0 {
-									os.Remove(srcFiles[i])
+				if deleteAfterUpload {
+					for _, fn := range matches {
+						if len(fn) > 0 {
+							os.Remove(fn)
 						}
 					}
 				}
 			} else {
 				logger.Println("uploadZipLogFile failed :", err)
 			}
+			os.Remove(zipFile)
 		} else if err != nil {
 			logger.Println("zipLogFiles failed :", err)
 		}
-			}()
+	}(deleteAfterUpload, root, matches)
+}
 
+func (hc *houstonClient) uploadFiles(req *shared.UploadRequest) error {
+	logger.Println("uploadFiles req :", *req)
+	for _, child := range hc.childProcs {
+		if child.version == req.Version && child.name == req.Name {
+			hc.uploadProcFiles(child, req.Filter, false)
 			return nil
 		}
 	}
 
 	// 실행 중이 아닌 폴더에서도 대상을 찾는다
 	// 전체 파일을 대상으로
-	zipFile, srcFiles, err := zipLogFiles(hc.config.StorageRoot, req)
-	if err == nil && len(zipFile) > 0 && len(srcFiles) > 0 {
+	root, matches := findMatchFiles(hc.config.StorageRoot, req.Name, req.Version, req.Filter)
+	zipFile, err := zipCompressFiles(root, matches)
+	if err == nil && len(zipFile) > 0 && len(zipFile) > 0 {
 		if err = hc.uploadZipLogFile(zipFile, req.Name, req.Version); err == nil {
-			// 마지막거 빼고 삭제
-			sort.StringSlice(srcFiles).Sort()
-			for i := 0; i < len(srcFiles)-1; i++ {
-				if len(srcFiles[i]) > 0 {
-					os.Remove(srcFiles[i])
+			for _, fn := range matches {
+				if len(fn) > 0 {
+					os.Remove(fn)
 				}
 			}
+			os.Remove(zipFile)
 		} else {
 			logger.Println("uploadZipLogFile failed :", err)
 		}

main_client.go

@@ -8,6 +8,7 @@ import (
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"repositories.action2quare.com/ayo/gocommon/flagx"
+	"repositories.action2quare.com/ayo/gocommon/logger"
 	"repositories.action2quare.com/ayo/houston/client"
 
 	"net/http"
@@ -23,7 +24,14 @@ func main() {
 
 	http.Handle("/metrics", promhttp.Handler())
 	server := &http.Server{Addr: ":9100", Handler: nil}
-	go server.ListenAndServe()
+
+	go func() {
+		logger.Println("listen /metrics")
+		err := server.ListenAndServe()
+		if err != nil {
+			logger.Error(err)
+		}
+	}()
 
 	hc.Start()
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)

server/http_api.go

@@ -29,6 +29,8 @@ const (
 )
 
 func (h *houstonHandler) GetAgents(w http.ResponseWriter, r *http.Request) {
+	logger.Println("GetAgents")
+
 	enc := json.NewEncoder(w)
 	allHosts := h.Operation().Hosts()
 	enc.Encode(allHosts)
@@ -45,6 +47,8 @@ func readTagsFromFile(paths ...string) string {
 }
 
 func (h *houstonHandler) GetDeploySources(w http.ResponseWriter, r *http.Request) {
+	logger.Println("GetDeploySources")
+
 	files, err := os.ReadDir(h.deployPath)
 	if err != nil {
 		logger.Println(err)
@@ -100,6 +104,7 @@ func (h *houstonHandler) UploadDeploySource(w http.ResponseWriter, r *http.Reque
 	//     <input type="submit" value="업로드">
 	//   </form>
 	file, header, err := r.FormFile("file")
+
 	if err != nil {
 		logger.Println(err)
 		w.WriteHeader(http.StatusBadRequest)
@@ -118,6 +123,8 @@ func (h *houstonHandler) UploadDeploySource(w http.ResponseWriter, r *http.Reque
 	name := r.FormValue("name")
 	ext := path.Ext(header.Filename)
 
+	logger.Println("UploadDeploySource :", name, version)
+
 	var filename string
 
 	if version == "config" {
@@ -154,6 +161,7 @@ func (h *houstonHandler) DeleteDeploySource(w http.ResponseWriter, r *http.Reque
 	version := r.FormValue("version")
 	name := r.FormValue("name")
 
+	logger.Println("DeleteDeploySource :", name, version)
 	if len(version) == 0 || len(name) == 0 {
 		w.WriteHeader(http.StatusBadRequest)
 		return
@@ -161,6 +169,8 @@ func (h *houstonHandler) DeleteDeploySource(w http.ResponseWriter, r *http.Reque
 
 	// deploys 폴더는 파일시스템 서비스이므로 다운로드 가능
 	targetpath := path.Join(h.deployPath, name, version)
+	logger.Println("DeleteDeploySource :", name, version, targetpath)
+
 	if err := os.RemoveAll(targetpath); err != nil {
 		logger.Println("deleteDeploySource failed :", err)
 		w.WriteHeader(http.StatusInternalServerError)
@@ -220,6 +230,8 @@ func (h *houstonHandler) Deploy(w http.ResponseWriter, r *http.Request) {
 	version := r.FormValue("version")
 	traws := r.FormValue("targets")
 
+	logger.Println("Deploy :", name, version, traws)
+
 	var targets []string
 	if len(traws) > 0 {
 		if err := json.Unmarshal([]byte(traws), &targets); err != nil {
@@ -292,6 +304,8 @@ func (h *houstonHandler) Undeploy(w http.ResponseWriter, r *http.Request) {
 	version := r.FormValue("version")
 	traws := r.FormValue("targets")
 
+	logger.Println("Undeploy :", name, version, traws)
+
 	var targets []string
 	if len(traws) > 0 {
 		if err := json.Unmarshal([]byte(traws), &targets); err != nil {
@@ -328,6 +342,8 @@ func (h *houstonHandler) StartProcess(w http.ResponseWriter, r *http.Request) {
 	argsline := r.FormValue("args")
 	traws := r.FormValue("targets")
 
+	logger.Println("StartProcess :", name, version, argsline, traws)
+
 	var targets []string
 	if len(traws) > 0 {
 		if err := json.Unmarshal([]byte(traws), &targets); err != nil {
@@ -380,6 +396,8 @@ func (h *houstonHandler) StopProcess(w http.ResponseWriter, r *http.Request) {
 	//     <input type="submit" value="업로드">
 	//   </form>
 	name := r.FormValue("name")
+	logger.Println("StopProcess :", name)
+
 	if len(name) == 0 {
 		w.WriteHeader(http.StatusBadRequest)
 		return
@@ -424,6 +442,8 @@ func (h *houstonHandler) RestartProcess(w http.ResponseWriter, r *http.Request)
 	pidstr := r.FormValue("pid")
 	target := r.FormValue("target")
 	name := r.FormValue("name")
+	logger.Println("RestartProcess :", name, pidstr, target)
+
 	if len(target) == 0 || len(pidstr) == 0 || len(name) == 0 {
 		w.WriteHeader(http.StatusBadRequest)
 		return
@@ -468,6 +488,8 @@ func (h *houstonHandler) UploadLogs(w http.ResponseWriter, r *http.Request) {
 	//     <input type="submit" value="업로드">
 	//   </form>
 	name := r.FormValue("name")
+	logger.Println("UploadLogs :", name)
+
 	if len(name) == 0 {
 		w.WriteHeader(http.StatusBadRequest)
 		return
@@ -501,6 +523,8 @@ func (h *houstonHandler) GetLogFileLinks(w http.ResponseWriter, r *http.Request)
 	//   </form>
 	name := r.FormValue("name")
 	version := r.FormValue("version")
+	logger.Println("GetLogFileLinks :", name, version)
+
 	if len(name) == 0 || len(version) == 0 {
 		w.WriteHeader(http.StatusBadRequest)
 		return

server/http_handler.go

@@ -1,6 +1,7 @@
 package server
 
 import (
+	"archive/zip"
 	"crypto/md5"
 	"encoding/hex"
 	"fmt"
@@ -28,9 +29,10 @@ type houstonHandler struct {
 	methods          map[string]reflect.Method
 	deployPath       string
 	downloadPath     string
+	maingateApiToken string
 }
 
-func NewHoustonHandler() HoustonServerWithHandler {
+func NewHoustonHandler(apiToken string) HoustonServerWithHandler {
 	var tmp *houstonHandler
 
 	methods := make(map[string]reflect.Method)
@@ -42,6 +44,7 @@ func NewHoustonHandler() HoustonServerWithHandler {
 	return &houstonHandler{
 		HoustonServer:    NewServer(),
 		methods:          methods,
+		maingateApiToken: apiToken,
 	}
 }
 
@@ -126,8 +129,7 @@ func (h *houstonHandler) RegisterHandlers(serveMux gocommon.ServerMuxInterface,
 		defer func() {
 			s := recover()
 			if s != nil {
-				logger.Println(s)
-				debug.PrintStack()
+				logger.Error(s)
 			}
 			io.Copy(io.Discard, r.Body)
 			r.Body.Close()
@@ -138,11 +140,26 @@ func (h *houstonHandler) RegisterHandlers(serveMux gocommon.ServerMuxInterface,
 		filename := r.Header.Get("Houston-Service-Filename")
 		dir := path.Join(h.downloadPath, name, version)
 		if err := os.MkdirAll(dir, 0775); err == nil {
-			file, _ := os.Create(path.Join(dir, filename))
-			if file != nil {
-				defer file.Close()
-				if _, err = io.Copy(file, r.Body); err != nil {
+			filepath := path.Join(dir, filename)
+			localfile, _ := os.Create(filepath)
+			logger.Println("file uploaded :", localfile)
+			if localfile != nil {
+				if _, err = io.Copy(localfile, r.Body); err != nil {
 					w.WriteHeader(http.StatusInternalServerError)
+				} else {
+					localfile.Close()
+					localfile, _ = os.Open(filepath)
+					if strings.HasSuffix(filename, ".zip") {
+						stat, _ := localfile.Stat()
+						zipreader, _ := zip.NewReader(localfile, stat.Size())
+						for _, f := range zipreader.File {
+							file, _ := os.Create(path.Join(dir, f.Name))
+							comp, _ := f.Open()
+							io.Copy(file, comp)
+							file.Close()
+						}
+						os.Remove(filepath)
+					}
 				}
 			} else {
 				w.WriteHeader(http.StatusInternalServerError)
@@ -172,6 +189,7 @@ func (h *houstonHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		r.Body.Close()
 	}()
 
+	// TODO : 구글 인증까지 붙인 후에 주석 제거
 	// var userinfo map[string]any
 	// if !*noauth && (*authtype == "on" || *authtype == "both") {
 	// 	authheader := r.Header.Get("Authorization")

server/server.go

@@ -5,6 +5,7 @@ import (
 	"net"
 
 	"repositories.action2quare.com/ayo/gocommon"
+	"repositories.action2quare.com/ayo/gocommon/flagx"
 	"repositories.action2quare.com/ayo/gocommon/logger"
 	"repositories.action2quare.com/ayo/houston/shared"
 	"repositories.action2quare.com/ayo/houston/shared/protos"
@@ -108,11 +109,14 @@ type Operation interface {
 }
 
 type outerconfig struct {
-	Houston *struct {
+	Houston struct {
 		Server serverConfig `json:"server"`
 	} `json:"houston"`
 }
 
+var storagePath = flagx.String("hs_storage", "", "")
+var grpcPort = flagx.Int("hs_grpc_port", 0, "")
+
 func loadServerConfig() serverConfig {
 	var oc outerconfig
 	err := gocommon.LoadConfig[outerconfig](&oc)
@@ -123,6 +127,15 @@ func loadServerConfig() serverConfig {
 		}
 	}
 
+	if len(*storagePath) > 0 {
+		// override
+		oc.Houston.Server.StorageRoot = *storagePath
+	}
+
+	if *grpcPort != 0 {
+		oc.Houston.Server.GrpcPort = *grpcPort
+	}
+
 	return oc.Houston.Server
 }
 

shared/operator.go

@@ -30,6 +30,8 @@ type StartProcessRequest struct {
 	Name          string
 	Version       string
 	Args          []string
+	AutoRestart   bool
+	OutputLogFile string
 }
 
 type StopProcessRequest struct {