jcarr
/
forged
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use httppb.Log()

This commit is contained in:
Jeff Carr 2025-09-09 17:14:55 -05:00
parent 979fd2f978
commit 82b232f47a
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
handlePatches.go
View File

@ -14,7 +14,7 @@ func addNewPatches(pb *forgepb.Patches, reqPB *httppb.HttpRequest) *forgepb.Patc
me.forge.AddNewPatch(newpatch) me.forge.AddNewPatch(newpatch)
newPatchesPB.Append(newpatch) newPatchesPB.Append(newpatch)
} }
reqPB.Log = append(reqPB.Log, log.Sprintf("Recived %d patches from client", newPatchesPB.Len())) reqPB.Logf("Recived %d patches from client", newPatchesPB.Len())
return newPatchesPB return newPatchesPB
} }

30
http.go
View File

@ -13,7 +13,7 @@ import (
func logReqPB(pb *httppb.HttpRequest) { func logReqPB(pb *httppb.HttpRequest) {
log.Info("LOG: httppb.HttpRequest START:") log.Info("LOG: httppb.HttpRequest START:")
for i, line := range pb.Log { for i, line := range pb.Logs {
log.Infof("%d, URL:%s LINE: %s\n", int(i), pb.URL, line) log.Infof("%d, URL:%s LINE: %s\n", int(i), pb.URL, line)
} }
log.Info("LOG: httppb.HttpRequest END") log.Info("LOG: httppb.HttpRequest END")
@ -21,9 +21,9 @@ 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 = append(reqPB.Log, fmt.Sprintf("START: Got %d bytes from the client", len(reqPB.ClientData))) reqPB.Log("START: Got %d bytes from the client", len(reqPB.ClientData))
if err != nil { if err != nil {
reqPB.Log = append(reqPB.Log, fmt.Sprintf("httppb err %v", err)) reqPB.Logf("httppb err %v", err)
} }
route := reqPB.Route route := reqPB.Route
@ -38,25 +38,25 @@ 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 = append(reqPB.Log, log.Sprintf("Repos Unmarshal() len=%d", pb.Len())) reqPB.Log("Repos Unmarshal() len=%d", pb.Len())
} else { } else {
reqPB.Log = append(reqPB.Log, log.Sprintf("Repos Unmarshal() err=%v", err)) reqPB.Logf("Repos Unmarshal() err=%v", err)
} }
result := gitpb.NewRepos() result := gitpb.NewRepos()
switch route { switch route {
case "/repos/check": case "/repos/check":
result = addRequest(pb, reqPB) result = addRequest(pb, reqPB)
reqPB.Log = append(reqPB.Log, log.Sprintf("repos check result.Len()=%d pb.Len()=%d\n", result.Len(), pb.Len())) reqPB.Logf("repos check result.Len()=%d pb.Len()=%d\n", result.Len(), pb.Len())
case "/repos/pull": case "/repos/pull":
result = pullRequest(pb, reqPB) result = pullRequest(pb, reqPB)
case "/repos/add": case "/repos/add":
result = addRequest(pb, reqPB) result = addRequest(pb, reqPB)
default: default:
reqPB.Log = append(reqPB.Log, log.Sprintf("repos check result.Len()=%d pb.Len()=%d\n", result.Len(), pb.Len())) reqPB.Logf("repos check result.Len()=%d pb.Len()=%d\n", result.Len(), pb.Len())
log.Info("repos", route, "unknown") log.Info("repos", route, "unknown")
} }
if err := result.SendReply(w, reqPB); err != nil { if err := result.SendReply(w, reqPB); err != nil {
reqPB.Log = append(reqPB.Log, log.Sprintf("Oh well, Send to client failed. err=%v", err)) reqPB.Logf("Oh well, Send to client failed. err=%v", err)
} }
// todo: logReq(reqPB) // todo: logReq(reqPB)
logReqPB(reqPB) logReqPB(reqPB)
@ -66,19 +66,19 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(route, "/patches/") { if strings.HasPrefix(route, "/patches/") {
pb := forgepb.NewPatches() pb := forgepb.NewPatches()
if err := pb.Unmarshal(reqPB.ClientData); err == nil { if err := pb.Unmarshal(reqPB.ClientData); err == nil {
reqPB.Log = append(reqPB.Log, log.Sprintf("Patches Unmarshal() len=%d", pb.Len())) reqPB.Logf("Patches Unmarshal() len=%d", pb.Len())
} else { } else {
reqPB.Log = append(reqPB.Log, log.Sprintf("Patches Unmarshal() err=%v", err)) reqPB.Logf("Patches Unmarshal() err=%v", err)
} }
result := forgepb.NewPatches() result := forgepb.NewPatches()
switch route { switch route {
case "/patches/new": case "/patches/new":
result = addNewPatches(pb, reqPB) result = addNewPatches(pb, reqPB)
reqPB.Log = append(reqPB.Log, log.Sprintf("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.Log = append(reqPB.Log, log.Sprintf("not really anything needs to be done on applied patches?")) reqPB.Logf("not really anything needs to be done on applied patches?")
case "/patches/merged": case "/patches/merged":
reqPB.Log = append(reqPB.Log, log.Sprintf("a maintainer has merged these patches")) reqPB.Logf("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":
@ -87,7 +87,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
result = addNewPatches(pb, reqPB) result = addNewPatches(pb, reqPB)
} }
if err := result.SendReply(w, reqPB); err != nil { if err := result.SendReply(w, reqPB); err != nil {
reqPB.Log = append(reqPB.Log, log.Sprintf("Oh well, Send to client failed. err=%v", err)) reqPB.Logf("Oh well, Send to client failed. err=%v", err)
} }
me.forge.SavePatchsets() me.forge.SavePatchsets()
// todo: logReq(reqPB) // todo: logReq(reqPB)
@ -98,7 +98,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(route, "/patchsets/") { if strings.HasPrefix(route, "/patchsets/") {
pb, err := makePatchsetsPB(reqPB) pb, err := makePatchsetsPB(reqPB)
if err != nil { if err != nil {
reqPB.Log = append(reqPB.Log, log.Sprintf("%v", err)) reqPB.Logf("%v", err)
} }
result := forgepb.NewPatchsets() result := forgepb.NewPatchsets()
switch route { switch route {