diff --git a/aufs/core/sysmonitor.go b/aufs/core/sysmonitor.go index d38c36d..2c711c3 100644 --- a/aufs/core/sysmonitor.go +++ b/aufs/core/sysmonitor.go @@ -2,7 +2,7 @@ package core import ( "aufs/proto/pb" - "encoding/json" + "encoding/base64" "fmt" "log" "net/http" @@ -108,19 +108,26 @@ func SysMonitor(w http.ResponseWriter, r *http.Request) { http.Error(w, err.Error(), http.StatusInternalServerError) } + // ver:0821 + // 输出proto + encdata := base64.StdEncoding.EncodeToString(hdinfo) + w.Header().Set("content-type", "application/x-protobuf") + w.Write([]byte(encdata)) + // make json string - jsondata, err := json.Marshal(hdinfo) - if err != nil { - http.Error(w, err.Error(), http.StatusInternalServerError) - } - w.Header().Set("Content-Type", "application/json") + // jsondata, err := json.Marshal(hdinfo) + // if err != nil { + // http.Error(w, err.Error(), http.StatusInternalServerError) + // } + + // w.Header().Set("Content-Type", "application/json") // 生成json数据 - jsondata, err = json.Marshal(SysResp{ - Status: 0, - Message: "success", - Data: hdinfo, - }) + // jsondata, err = json.Marshal(SysResp{ + // Status: 0, + // Message: "success", + // Data: hdinfo, + // }) // - w.Write(jsondata) + // w.Write(jsondata) }