ayo/houston
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

config파일을 추가로 배포

Browse Source
This commit is contained in:
mountain
2023-06-12 12:28:33 +09:00
parent 471d07a188
commit b14ad791df
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/deploy.go
View File

@ -188,11 +188,11 @@ func (hc *houstonClient) prepareDeploy(name string, version string) (destPath st
return verpath, nil
}
func (hc *houstonClient) makeDownloadUrl(req *shared.DeployRequest) string {
out := req.Url
func (hc *houstonClient) makeDownloadUrl(rel string) string {
out := rel
if !strings.HasPrefix(out, "http") {
tks := strings.SplitN(hc.httpAddr, "://", 2)
out = fmt.Sprintf("%s://%s", tks[0], path.Join(tks[1], req.Url))
out = fmt.Sprintf("%s://%s", tks[0], path.Join(tks[1], rel))
}
return out
}
@ -241,7 +241,7 @@ func (hc *houstonClient) prepareUpdateSelf(req *shared.DeployRequest) (srcdir st
if err != nil {
return "", "", err
}
fname, err := download(tempdir, hc.makeDownloadUrl(req), req.AccessToken)
fname, err := download(tempdir, hc.makeDownloadUrl(req.Url), req.AccessToken)
if err != nil {
return "", "", err
}
@ -274,7 +274,7 @@ func (hc *houstonClient) deploy(req *shared.DeployRequest) error {
logger.Println("start downloading", req.Url)
// verpath에 배포 시작
fname, err := download(root, hc.makeDownloadUrl(req), req.AccessToken)
fname, err := download(root, hc.makeDownloadUrl(req.Url), req.AccessToken)
if err != nil {
return err
}
@ -286,6 +286,11 @@ func (hc *houstonClient) deploy(req *shared.DeployRequest) error {
err = untar(fname)
}
if err == nil {
// config.json도 다운로드
_, err = download(root, hc.makeDownloadUrl(req.Config), req.AccessToken)
}
return err
}

3
server/http_api.go
View File

@ -90,7 +90,7 @@ func (h *houstonHandler) UploadDeploySource(w http.ResponseWriter, r *http.Reque
var filename string
if version == "config" {
filename = path.Join("deploys", name, version, "config"+ext)
filename = path.Join("deploys", name, version, "config.json")
} else {
// deploys 폴더는 파일시스템 서비스이므로 다운로드 가능
filename = path.Join("deploys", name, version, name+ext)
@ -189,6 +189,7 @@ func (h *houstonHandler) Deploy(w http.ResponseWriter, r *http.Request) {
Name: name,
Version: version,
Url: path.Join(relPath, latestFilename),
Config: path.Join("deploys", name, "config", "config.json"),
},
targets,
))

1
shared/operator.go
View File

@ -22,6 +22,7 @@ type DeployRequest struct {
Name string
Version string
Url string
Config string
AccessToken string
}