much better and easier to read code

2 files changed, 14 insertions, 15 deletions

diff --git a/handlePatches.go b/handlePatches.go
index 8d2d93c..595a918 100644
--- a/handlePatches.go
+++ b/handlePatches.go
@@ -4,7 +4,6 @@ import (
 	"net/http"
 
 	"go.wit.com/lib/protobuf/forgepb"
-	"go.wit.com/lib/protobuf/gitpb"
 	"go.wit.com/lib/protobuf/httppb"
 	"go.wit.com/log"
 )
@@ -47,17 +46,13 @@ func sendPendingPatchsets(pb *forgepb.Patchsets, reqPB *httppb.HttpRequest) *for
 	return allPatchsetsPB
 }
 
-func makeReposPB(reqPB *httppb.HttpRequest) (*gitpb.Repos, error) {
-	pb := gitpb.NewRepos()
-	err := pb.Unmarshal(reqPB.ServerData)
-	return pb, err
-}
-
+/*
 func makePatchesPB(reqPB *httppb.HttpRequest) (*forgepb.Patches, error) {
 	pb := forgepb.NewPatches()
 	err := pb.Unmarshal(reqPB.ServerData)
 	return pb, err
 }
+*/
 
 func makePatchsetsPB(reqPB *httppb.HttpRequest) (*forgepb.Patchsets, error) {
 	pb := forgepb.NewPatchsets()
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 {