mbk-lab
/
wide
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

.

This commit is contained in:
Liang Ding 2014-10-23 15:02:33 +08:00
parent 4803025da1
commit 651bb19a93
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
output/outputs.go
View File

@ -5,6 +5,7 @@ import (
"bufio" "bufio"
"encoding/json" "encoding/json"
"io" "io"
"io/ioutil"
"math/rand" "math/rand"
"net/http" "net/http"
"os" "os"
@ -287,7 +288,7 @@ func BuildHandler(w http.ResponseWriter, r *http.Request) {
wsChannel.Time = time.Now() wsChannel.Time = time.Now()
} }
reader := io.MultiReader(stdout, stderr) reader := bufio.NewReader(io.MultiReader(stdout, stderr))
if err := cmd.Start(); nil != err { if err := cmd.Start(); nil != err {
glog.Error(err) glog.Error(err)
@ -303,14 +304,13 @@ func BuildHandler(w http.ResponseWriter, r *http.Request) {
glog.V(3).Infof("Session [%s] is building [id=%d, dir=%s]", sid, runningId, curDir) glog.V(3).Infof("Session [%s] is building [id=%d, dir=%s]", sid, runningId, curDir)
// 一次性读取 // 一次性读取
buf := make([]byte, 1024*8) buf, _ := ioutil.ReadAll(reader)
count, _ := reader.Read(buf)
channelRet := map[string]interface{}{} channelRet := map[string]interface{}{}
channelRet["cmd"] = "build" channelRet["cmd"] = "build"
channelRet["executable"] = executable channelRet["executable"] = executable
if 0 == count { // 说明构建成功，没有错误信息输出 if 0 == len(buf) { // 说明构建成功，没有错误信息输出
// 设置下一次执行命令（前端会根据该参数发送请求） // 设置下一次执行命令（前端会根据该参数发送请求）
channelRet["nextCmd"] = args["nextCmd"] channelRet["nextCmd"] = args["nextCmd"]
channelRet["output"] = "<span class='build-succ'>" + i18n.Get(r, "build-succ").(string) + "</span>\n" channelRet["output"] = "<span class='build-succ'>" + i18n.Get(r, "build-succ").(string) + "</span>\n"
@ -328,7 +328,7 @@ func BuildHandler(w http.ResponseWriter, r *http.Request) {
}() }()
} else { // 构建失败 } else { // 构建失败
// 解析错误信息，返回给编辑器 gutter lint // 解析错误信息，返回给编辑器 gutter lint
errOut := string(buf[:count]) errOut := string(buf)
channelRet["output"] = "<span class='build-failed'>" + i18n.Get(r, "build-failed").(string) + "</span>\n" + errOut channelRet["output"] = "<span class='build-failed'>" + i18n.Get(r, "build-failed").(string) + "</span>\n" + errOut
lines := strings.Split(errOut, "\n") lines := strings.Split(errOut, "\n")