convert to httppb
This commit is contained in:
parent
82b232f47a
commit
6722b019ec
18
http.go
18
http.go
|
@ -21,7 +21,7 @@ func logReqPB(pb *httppb.HttpRequest) {
|
||||||
|
|
||||||
func okHandler(w http.ResponseWriter, r *http.Request) {
|
func okHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
reqPB, err := httppb.ReqToPB(r)
|
reqPB, err := httppb.ReqToPB(r)
|
||||||
reqPB.Log("START: Got %d bytes from the client", len(reqPB.ClientData))
|
reqPB.Logf("START: Got %d bytes from the client", len(reqPB.ClientData))
|
||||||
if err != nil {
|
if err != nil {
|
||||||
reqPB.Logf("httppb err %v", err)
|
reqPB.Logf("httppb err %v", err)
|
||||||
}
|
}
|
||||||
|
@ -38,7 +38,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
if strings.HasPrefix(route, "/repos/") {
|
if strings.HasPrefix(route, "/repos/") {
|
||||||
pb := gitpb.NewRepos()
|
pb := gitpb.NewRepos()
|
||||||
if err := pb.Unmarshal(reqPB.ClientData); err == nil {
|
if err := pb.Unmarshal(reqPB.ClientData); err == nil {
|
||||||
reqPB.Log("Repos Unmarshal() len=%d", pb.Len())
|
reqPB.Logf("Repos Unmarshal() len=%d", pb.Len())
|
||||||
} else {
|
} else {
|
||||||
reqPB.Logf("Repos Unmarshal() err=%v", err)
|
reqPB.Logf("Repos Unmarshal() err=%v", err)
|
||||||
}
|
}
|
||||||
|
@ -76,9 +76,9 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
result = addNewPatches(pb, reqPB)
|
result = addNewPatches(pb, reqPB)
|
||||||
reqPB.Logf("addNewPatches() pb.Len()=%d result.Len()=%d\n", pb.Len(), result.Len())
|
reqPB.Logf("addNewPatches() pb.Len()=%d result.Len()=%d\n", pb.Len(), result.Len())
|
||||||
case "/patches/applied":
|
case "/patches/applied":
|
||||||
reqPB.Logf("not really anything needs to be done on applied patches?")
|
reqPB.Log("not really anything needs to be done on applied patches?")
|
||||||
case "/patches/merged":
|
case "/patches/merged":
|
||||||
reqPB.Logf("a maintainer has merged these patches")
|
reqPB.Log("a maintainer has merged these patches")
|
||||||
result = handleMergedPatches(pb, reqPB)
|
result = handleMergedPatches(pb, reqPB)
|
||||||
// result = handleAppliedPatches(pb, reqPB)
|
// result = handleAppliedPatches(pb, reqPB)
|
||||||
case "/patches/get":
|
case "/patches/get":
|
||||||
|
@ -120,27 +120,28 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
|
||||||
// used for uptime monitor checking
|
// used for uptime monitor checking
|
||||||
if route == "/uptime" {
|
if route == "/uptime" {
|
||||||
writeFile(w, "uptime.html")
|
httppb.WriteFile(w, resources, "uptime.html")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if route == "/goReference.svg" {
|
if route == "/goReference.svg" {
|
||||||
w.Header().Set("Content-Type", "image/svg+xml")
|
w.Header().Set("Content-Type", "image/svg+xml")
|
||||||
writeFile(w, "goReference.svg")
|
httppb.WriteFile(w, resources, "goReference.svg")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if route == "/skeleton.v2.css" {
|
if route == "/skeleton.v2.css" {
|
||||||
writeFile(w, "skeleton.v2.css")
|
httppb.WriteFile(w, resources, "skeleton.v2.css")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if route == "/favicon.ico" {
|
if route == "/favicon.ico" {
|
||||||
writeFile(w, "ipv6.png")
|
httppb.WriteFile(w, resources, "ipv6.png")
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
log.Warn("BAD URL =", reqPB.URL, "from", reqPB.IP, "author", reqPB.Hostname)
|
log.Warn("BAD URL =", reqPB.URL, "from", reqPB.IP, "author", reqPB.Hostname)
|
||||||
badurl(w, r.URL.String())
|
badurl(w, r.URL.String())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/*
|
||||||
func writeFile(w http.ResponseWriter, filename string) {
|
func writeFile(w http.ResponseWriter, filename string) {
|
||||||
// fmt.Fprintln(w, "GOT TEST?")
|
// fmt.Fprintln(w, "GOT TEST?")
|
||||||
fullname := "resources/" + filename
|
fullname := "resources/" + filename
|
||||||
|
@ -155,6 +156,7 @@ func writeFile(w http.ResponseWriter, filename string) {
|
||||||
repohtml = string(pfile)
|
repohtml = string(pfile)
|
||||||
fmt.Fprintln(w, repohtml)
|
fmt.Fprintln(w, repohtml)
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
func badurl(w http.ResponseWriter, badurl string) {
|
func badurl(w http.ResponseWriter, badurl string) {
|
||||||
fmt.Fprintln(w, "<!DOCTYPE html>")
|
fmt.Fprintln(w, "<!DOCTYPE html>")
|
||||||
|
|
Loading…
Reference in New Issue