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

patches being sent again when requested

This commit is contained in:
Jeff Carr 2025-09-07 21:38:15 -05:00
parent a099bbd3e6
commit 873cb39932
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
handlePatches.go
View File

@ -32,9 +32,8 @@ func sendPendingPatches(pb *forgepb.Patches, reqPB *httppb.HttpRequest) *forgepb
func sendPendingPatchsets(pb *forgepb.Patchsets, reqPB *httppb.HttpRequest) *forgepb.Patchsets { func sendPendingPatchsets(pb *forgepb.Patchsets, reqPB *httppb.HttpRequest) *forgepb.Patchsets {
allPatchsetsPB := new(forgepb.Patchsets) allPatchsetsPB := new(forgepb.Patchsets)
for pset := range me.forge.Patchsets.IterAll() { for pset := range me.forge.Patchsets.IterAll() {
if pset.Name == "forge auto submit" { reqPB.Errors = append(reqPB.Errors, log.Sprintf("adding %s with len=%d", pset.Name, pset.Patches.Len()))
allPatchsetsPB.Append(pset) allPatchsetsPB.Append(pset)
}
} }
return allPatchsetsPB return allPatchsetsPB
} }

12
http.go
View File

@ -48,8 +48,15 @@ func whoSent(r *http.Request) string {
return log.Sprintf("%s\t%s", getClientIP(r), r.Header.Get("hostname")) return log.Sprintf("%s\t%s", getClientIP(r), r.Header.Get("hostname"))
} }
func logReqPB(pb *httppb.HttpRequest) {
log.Info("LOG: httppb.HttpRequest Errors START:")
log.Info(strings.Join(pb.Errors, "\n"))
log.Info("LOG: httppb.HttpRequest Errors END")
}
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.Errors = append(reqPB.Errors, fmt.Sprintf("START: Got %d bytes from the client", len(reqPB.Body)))
if err != nil { if err != nil {
log.Info("something crazy err", err) log.Info("something crazy err", err)
} }
@ -93,6 +100,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
log.Info("Oh well, Send to client failed. err =", err) log.Info("Oh well, Send to client failed. err =", err)
} }
// todo: logReq(reqPB) // todo: logReq(reqPB)
logReqPB(reqPB)
return return
} }
@ -116,6 +124,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
} }
me.forge.SavePatchsets() me.forge.SavePatchsets()
// todo: logReq(reqPB) // todo: logReq(reqPB)
logReqPB(reqPB)
return return
} }
@ -134,10 +143,13 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
if err := result.SendReply(w, reqPB); err != nil { if err := result.SendReply(w, reqPB); err != nil {
log.Info("Oh well, Send to client failed. err =", err) log.Info("Oh well, Send to client failed. err =", err)
} }
log.Info("Send to client seems to have worked. errors:", reqPB.Errors)
me.forge.SavePatchsets() me.forge.SavePatchsets()
// todo: logReq(reqPB) // todo: logReq(reqPB)
logReqPB(reqPB)
return return
} }
logReqPB(reqPB)
/* /*
if route == "/patchset" { if route == "/patchset" {