[feat] remove cgo and add cmd stderr output
This commit is contained in:
parent
bb3abfe3a7
commit
cc128b5b9d
2
Makefile
2
Makefile
@ -3,7 +3,7 @@
|
||||
BIN_NAME := deploy
|
||||
|
||||
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:
|
||||
rm $(BIN_NAME)
|
||||
|
@ -52,18 +52,33 @@ func (s *HTTPServer) setHandler(check map[string]string, script string) gin.Hand
|
||||
if err != nil {
|
||||
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 {
|
||||
nlog.Warnf("start script fail: %+v\n", err)
|
||||
}
|
||||
|
||||
in := bufio.NewScanner(reader)
|
||||
for in.Scan() {
|
||||
nlog.Debugf(in.Text())
|
||||
}
|
||||
if err := in.Err(); err != nil {
|
||||
nlog.Warnf("script error: %+v\n", err)
|
||||
}
|
||||
go func() {
|
||||
in := bufio.NewScanner(reader)
|
||||
for in.Scan() {
|
||||
nlog.Debugf(in.Text())
|
||||
}
|
||||
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)
|
||||
}
|
||||
}()
|
||||
|
||||
}()
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user