summaryrefslogtreecommitdiff
path: root/http.go
diff options
context:
space:
mode:
Diffstat (limited to 'http.go')
-rw-r--r--http.go20
1 files changed, 12 insertions, 8 deletions
diff --git a/http.go b/http.go
index b243703..7e276a4 100644
--- a/http.go
+++ b/http.go
@@ -51,7 +51,7 @@ func whoSent(r *http.Request) string {
func logReqPB(pb *httppb.HttpRequest) {
log.Info("LOG: httppb.HttpRequest START:")
for i, line := range pb.Log {
- log.Infof("\t%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")
}
@@ -76,12 +76,14 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
return
}
- reqPB.Log = append(reqPB.Log, log.Sprintf("forged REQUEST URL =", requrl, "from =", who))
+ reqPB.Log = append(reqPB.Log, log.Sprintf("forged REQUEST URL=%s", requrl))
if strings.HasPrefix(route, "/repos/") {
- pb, err := makeReposPB(reqPB)
- if err != nil {
- reqPB.Log = append(reqPB.Log, log.Sprintf("%v", err))
+ pb := gitpb.NewRepos()
+ if err := pb.Unmarshal(reqPB.ClientData); err == nil {
+ reqPB.Log = append(reqPB.Log, log.Sprintf("Repos Unmarshal() len=%d", pb.Len()))
+ } else {
+ reqPB.Log = append(reqPB.Log, log.Sprintf("Repos Unmarshal() err=%v", err))
}
result := gitpb.NewRepos()
switch route {
@@ -105,9 +107,11 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
}
if strings.HasPrefix(route, "/patches/") {
- pb, err := makePatchesPB(reqPB)
- if err != nil {
- reqPB.Log = append(reqPB.Log, log.Sprintf("%v", err))
+ pb := forgepb.NewPatches()
+ if err := pb.Unmarshal(reqPB.ClientData); err == nil {
+ reqPB.Log = append(reqPB.Log, log.Sprintf("Patches Unmarshal() len=%d", pb.Len()))
+ } else {
+ reqPB.Log = append(reqPB.Log, log.Sprintf("Patches Unmarshal() err=%v", err))
}
result := forgepb.NewPatches()
switch route {