mtfos/auto-deploy-service
1
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

[feat] remove cgo and add cmd stderr output

Browse Source
This commit is contained in:
Jay 2021-06-14 22:58:39 +08:00
parent bb3abfe3a7
commit cc128b5b9d
2 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -3,7 +3,7 @@
BIN_NAME := deploy BIN_NAME := deploy
build: build:
go build -buildmode=pie -ldflags '-w -s' -o $(BIN_NAME) ./cmd/svc/main.go CGO_ENABLED=0 go build -buildmode=pie -ldflags '-w -s' -o $(BIN_NAME) ./cmd/svc/main.go
clean: clean:
rm $(BIN_NAME) rm $(BIN_NAME)

15
pkg/server/server.go
View File

@ -52,11 +52,16 @@ func (s *HTTPServer) setHandler(check map[string]string, script string) gin.Hand
if err != nil { if err != nil {
nlog.Warnf("setup pipe out fail: %+v\n", err) nlog.Warnf("setup pipe out fail: %+v\n", err)
} }
errReader, err := cmd.StderrPipe()
if err != nil {
nlog.Warnf("setup pipe out fail: %+v\n", err)
}
if err := cmd.Start(); err != nil { if err := cmd.Start(); err != nil {
nlog.Warnf("start script fail: %+v\n", err) nlog.Warnf("start script fail: %+v\n", err)
} }
go func() {
in := bufio.NewScanner(reader) in := bufio.NewScanner(reader)
for in.Scan() { for in.Scan() {
nlog.Debugf(in.Text()) nlog.Debugf(in.Text())
@ -64,6 +69,16 @@ func (s *HTTPServer) setHandler(check map[string]string, script string) gin.Hand
if err := in.Err(); err != nil { if err := in.Err(); err != nil {
nlog.Warnf("script error: %+v\n", err) nlog.Warnf("script error: %+v\n", err)
} }
}()
go func() {
in := bufio.NewScanner(errReader)
for in.Scan() {
nlog.Debugf(in.Text())
}
if err := in.Err(); err != nil {
nlog.Warnf("script error: %+v\n", err)
}
}()
}() }()