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

houston handler 추가

Browse Source
This commit is contained in:
mountain
2023-05-23 13:54:25 +09:00
parent 299aeadba5
commit 8289018fd6
2 changed files with 136 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
server/http_api.go
View File

@ -10,7 +10,6 @@ import (
"time"
"repositories.action2quare.com/ayo/go-ayo/logger"
"repositories.action2quare.com/ayo/houston/shared"
)
@ -49,7 +48,7 @@ func (h *houstonHandler) GetDeploySources(w http.ResponseWriter, r *http.Request
enc.Encode(out)
}
func (h *houstonHandler) Upload(w http.ResponseWriter, r *http.Request) {
func (h *houstonHandler) UploadDeploySource(w http.ResponseWriter, r *http.Request) {
// <form action="/houston" method="post" enctype="multipart/form-data">
// <input type="file" name="file">
// <input type="text" name="name">
@ -104,10 +103,12 @@ func (h *houstonHandler) Deploy(w http.ResponseWriter, r *http.Request) {
traws := r.FormValue("targets")
var targets []string
if err := json.Unmarshal([]byte(traws), &targets); err != nil {
logger.Error(err)
w.WriteHeader(http.StatusBadRequest)
return
if len(traws) > 0 {
if err := json.Unmarshal([]byte(traws), &targets); err != nil {
logger.Error(err)
w.WriteHeader(http.StatusBadRequest)
return
}
}
if len(name) == 0 || len(version) == 0 || len(targets) == 0 {
@ -165,10 +166,12 @@ func (h *houstonHandler) StartProcess(w http.ResponseWriter, r *http.Request) {
traws := r.FormValue("targets")
var targets []string
if err := json.Unmarshal([]byte(traws), &targets); err != nil {
logger.Error(err)
w.WriteHeader(http.StatusBadRequest)
return
if len(traws) > 0 {
if err := json.Unmarshal([]byte(traws), &targets); err != nil {
logger.Error(err)
w.WriteHeader(http.StatusBadRequest)
return
}
}
if len(name) == 0 || len(version) == 0 || len(targets) == 0 {
@ -202,10 +205,12 @@ func (h *houstonHandler) StopProcess(w http.ResponseWriter, r *http.Request) {
traws := r.FormValue("targets")
var targets []string
if err := json.Unmarshal([]byte(traws), &targets); err != nil {
logger.Error(err)
w.WriteHeader(http.StatusBadRequest)
return
if len(traws) > 0 {
if err := json.Unmarshal([]byte(traws), &targets); err != nil {
logger.Error(err)
w.WriteHeader(http.StatusBadRequest)
return
}
}
pid, _ := strconv.Atoi(pidstr)
@ -216,3 +221,70 @@ func (h *houstonHandler) StopProcess(w http.ResponseWriter, r *http.Request) {
Pid: int32(pid),
}, targets))
}
func (h *houstonHandler) UploadLogs(w http.ResponseWriter, r *http.Request) {
// <form action="/houston" method="post" enctype="multipart/form-data">
// <input type="text" name="name">
// <input type="text" name="version">
// <input type="text" name="filter">
// <input type="text" name="targets">
// <input type="submit" value="업로드">
// </form>
name := r.FormValue("name")
if len(name) == 0 {
w.WriteHeader(http.StatusBadRequest)
return
}
version := r.FormValue("version") // option
traws := r.FormValue("targets")
filter := r.FormValue("filter")
if len(filter) == 0 {
filter = "logs/*"
}
var targets []string
if err := json.Unmarshal([]byte(traws), &targets); err != nil {
logger.Error(err)
w.WriteHeader(http.StatusBadRequest)
return
}
h.Operation().Upload(MakeUploadRequest(shared.UploadRequest{
Name: name,
Version: version,
Url: "upload",
Filter: filter,
}, targets))
}
func (h *houstonHandler) GetLogFileLinks(w http.ResponseWriter, r *http.Request) {
// <form action="/houston" method="post" enctype="multipart/form-data">
// <input type="text" name="name">
// <input type="text" name="version">
// </form>
name := r.FormValue("name")
version := r.FormValue("version")
if len(name) == 0 || len(version) == 0 {
w.WriteHeader(http.StatusBadRequest)
return
}
if version == "latest" {
version, _ = shared.FindLastestVersion(path.Join("downloads", name))
}
root := path.Join("downloads", name, version)
logfiles, err := os.ReadDir(root)
if err != nil {
w.WriteHeader(http.StatusInternalServerError)
return
}
var out []string
for _, lf := range logfiles {
out = append(out, path.Join(root, lf.Name()))
}
enc := json.NewEncoder(w)
enc.Encode(out)
}

51
server/http_handler.go
View File

@ -1,8 +1,10 @@
package server
import (
"fmt"
"io"
"net/http"
"os"
"path"
"reflect"
"runtime/debug"
@ -41,8 +43,49 @@ func NewHoustonHandler() HoustonServerWithHandler {
}
func (h *houstonHandler) RegisterHandlers(serveMux *http.ServeMux, prefix string) error {
logger.Println("houstonHandler registed")
serveMux.Handle("/"+path.Join(prefix, "houston"), h)
dfsx := http.FileServer(http.Dir("./deploys"))
serveMux.Handle(
"/"+path.Join(prefix, "deploys", "/"),
http.StripPrefix(fmt.Sprintf("/%s/deploys", prefix), dfsx))
ufsx := http.FileServer(http.Dir("./downloads"))
serveMux.Handle(
"/"+path.Join(prefix, "downloads", "/"),
http.StripPrefix(fmt.Sprintf("/%s/downloads", prefix), ufsx))
serveMux.HandleFunc("/"+path.Join(prefix, "upload"), func(w http.ResponseWriter, r *http.Request) {
defer func() {
s := recover()
if s != nil {
logger.Println(s)
debug.PrintStack()
}
io.Copy(io.Discard, r.Body)
r.Body.Close()
}()
name := r.Header.Get("Houston-Service-Name")
version := r.Header.Get("Houston-Service-Version")
filename := r.Header.Get("Houston-Service-Filename")
dir := fmt.Sprintf("./downloads/%s/%s", name, version)
if err := os.MkdirAll(dir, os.ModePerm); err == nil {
file, _ := os.Create(path.Join(dir, filename))
if file != nil {
defer file.Close()
if _, err = io.Copy(file, r.Body); err != nil {
w.WriteHeader(http.StatusInternalServerError)
}
} else {
w.WriteHeader(http.StatusInternalServerError)
}
} else {
w.WriteHeader(http.StatusInternalServerError)
}
})
return nil
}
@ -60,7 +103,13 @@ func (h *houstonHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
r.Body.Close()
}()
operation := r.FormValue("operation")
var operation string
if r.Method == "POST" {
operation = r.FormValue("operation")
} else {
operation = r.URL.Query().Get("operation")
}
if len(operation) == 0 {
w.WriteHeader(http.StatusBadRequest)
return