浏览代码

make /version http plain/text

since it just returns the version now, just make it plain
text.
Ask Bjørn Hansen 7 年之前
父节点
当前提交
d2e0b9202a
共有 2 个文件被更改,包括 5 次插入7 次删除
  1. 3 5
      http.go
  2. 2 2
      http_test.go

+ 3 - 5
http.go

@@ -229,11 +229,9 @@ func (hs *httpServer) mainServer(w http.ResponseWriter, req *http.Request) {
 		http.NotFound(w, req)
 		return
 	}
-	log.Printf("serverInfo: %+v", hs.serverInfo)
-	io.WriteString(w, `<html><head><title>GeoDNS `+
-		hs.serverInfo.Version+`</title><body>`+
-		`GeoDNS Server`+
-		`</body></html>`)
+	w.Header().Set("Content-Type", "text/plain")
+	w.WriteHeader(200)
+	io.WriteString(w, `GeoDNS `+hs.serverInfo.Version+`\n`)
 }
 
 type basicauth struct {

+ 2 - 2
http_test.go

@@ -43,8 +43,8 @@ func TestHTTP(t *testing.T) {
 	require.Nil(t, err)
 	page, _ := ioutil.ReadAll(res.Body)
 
-	if !bytes.Contains(page, []byte("<title>GeoDNS")) {
-		t.Log("/version didn't include '<title>GeoDNS'")
+	if !bytes.HasPrefix(page, []byte("GeoDNS ")) {
+		t.Log("/version didn't start with 'GeoDNS '")
 		t.Fail()
 	}