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

Merge pull request '[feat] remove cgo and add cmd stderr output' (#2) from release/1.0.1 into master

Browse Source 
Reviewed-on: #2
This commit is contained in:
Jay 2021-06-14 14:59:48 +00:00
commit 9a9ccaf5f5
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)

29
pkg/server/server.go
View File

@ -52,18 +52,33 @@ 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)
} }
in := bufio.NewScanner(reader) go func() {
for in.Scan() { in := bufio.NewScanner(reader)
nlog.Debugf(in.Text()) for in.Scan() {
} nlog.Debugf(in.Text())
if err := in.Err(); err != nil { }
nlog.Warnf("script error: %+v\n", err) if err := in.Err(); err != nil {
} 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)
}
}()
}() }()