summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Carr <[email protected]>2025-09-09 17:14:55 -0500
committerJeff Carr <[email protected]>2025-09-09 17:14:55 -0500
commit82b232f47a80eb389f5fec7e1960febdaa194d79 (patch)
tree9a486534ad0f7a08feaa17f56fab7a25ce562065
parent979fd2f9781c999b7654fc8a186fd28fb12580de (diff)
use httppb.Log()
-rw-r--r--handlePatches.go2
-rw-r--r--http.go30
2 files changed, 16 insertions, 16 deletions
diff --git a/handlePatches.go b/handlePatches.go
index 595a918..1237cba 100644
--- a/handlePatches.go
+++ b/handlePatches.go
@@ -14,7 +14,7 @@ func addNewPatches(pb *forgepb.Patches, reqPB *httppb.HttpRequest) *forgepb.Patc
me.forge.AddNewPatch(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
}
diff --git a/http.go b/http.go
index 74f1e66..9f6c43f 100644
--- a/http.go
+++ b/http.go
@@ -13,7 +13,7 @@ import (
func logReqPB(pb *httppb.HttpRequest) {
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.Info("LOG: httppb.HttpRequest END")
@@ -21,9 +21,9 @@ func logReqPB(pb *httppb.HttpRequest) {
func okHandler(w http.ResponseWriter, r *http.Request) {
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 {
- reqPB.Log = append(reqPB.Log, fmt.Sprintf("httppb err %v", err))
+ reqPB.Logf("httppb err %v", err)
}
route := reqPB.Route
@@ -38,25 +38,25 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(route, "/repos/") {
pb := gitpb.NewRepos()
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 {
- reqPB.Log = append(reqPB.Log, log.Sprintf("Repos Unmarshal() err=%v", err))
+ reqPB.Logf("Repos Unmarshal() err=%v", err)
}
result := gitpb.NewRepos()
switch route {
case "/repos/check":
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":
result = pullRequest(pb, reqPB)
case "/repos/add":
result = addRequest(pb, reqPB)
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")
}
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)
logReqPB(reqPB)
@@ -66,19 +66,19 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(route, "/patches/") {
pb := forgepb.NewPatches()
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 {
- reqPB.Log = append(reqPB.Log, log.Sprintf("Patches Unmarshal() err=%v", err))
+ reqPB.Logf("Patches Unmarshal() err=%v", err)
}
result := forgepb.NewPatches()
switch route {
case "/patches/new":
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":
- 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":
- 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 = handleAppliedPatches(pb, reqPB)
case "/patches/get":
@@ -87,7 +87,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
result = addNewPatches(pb, reqPB)
}
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()
// todo: logReq(reqPB)
@@ -98,7 +98,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
if strings.HasPrefix(route, "/patchsets/") {
pb, err := makePatchsetsPB(reqPB)
if err != nil {
- reqPB.Log = append(reqPB.Log, log.Sprintf("%v", err))
+ reqPB.Logf("%v", err)
}
result := forgepb.NewPatchsets()
switch route {