Compare commits

..

No commits in common. "9a9ccaf5f559c88c4913b4215e88ec8bdaceb6a9" and "bb3abfe3a796b9670d046d6a19bc2af9fcc7d44c" have entirely different histories.

2 changed files with 8 additions and 23 deletions

View File

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

View File

@ -52,33 +52,18 @@ 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()) }
} 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)
}
}()
}() }()