more standardation

1 files changed, 17 insertions, 17 deletions

diff --git a/http.go b/http.go
index 5d11c51..b243703 100644
--- a/http.go
+++ b/http.go
@@ -50,8 +50,8 @@ func whoSent(r *http.Request) string {
 
 func logReqPB(pb *httppb.HttpRequest) {
 	log.Info("LOG: httppb.HttpRequest START:")
-	for i, line := range strings.Join(pb.Log, "\n") {
-		log.Infof("\t%d %s\n", i, line)
+	for i, line := range pb.Log {
+		log.Infof("\t%d, URL:%s LINE: %s\n", int(i), pb.URL, line)
 	}
 	log.Info("LOG: httppb.HttpRequest END")
 }
@@ -60,7 +60,7 @@ 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)))
 	if err != nil {
-		log.Info("something crazy err", err)
+		reqPB.Log = append(reqPB.Log, fmt.Sprintf("httppb err %v", err))
 	}
 
 	who := whoSent(r)
@@ -76,13 +76,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	// used for uptime monitor checking
-	if route == "/uptime" {
-		writeFile(w, "uptime.html")
-		return
-	}
-
-	log.Warn("forged REQUEST URL =", requrl, "from =", who)
+	reqPB.Log = append(reqPB.Log, log.Sprintf("forged REQUEST URL =", requrl, "from =", who))
 
 	if strings.HasPrefix(route, "/repos/") {
 		pb, err := makeReposPB(reqPB)
@@ -93,16 +87,17 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		switch route {
 		case "/repos/check":
 			result = addRequest(pb, reqPB)
-			log.Infof("repos check result.Len()=%d pb.Len()=%d\n", result.Len(), pb.Len())
+			reqPB.Log = append(reqPB.Log, log.Sprintf("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()))
 			log.Info("repos", route, "unknown")
 		}
 		if err := result.SendReply(w, reqPB); err != nil {
-			log.Info("Oh well, Send to client failed. err =", err)
+			reqPB.Log = append(reqPB.Log, log.Sprintf("Oh well, Send to client failed. err=%v", err))
 		}
 		// todo: logReq(reqPB)
 		logReqPB(reqPB)
@@ -118,12 +113,11 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 		switch route {
 		case "/patches/new":
 			result = addNewPatches(pb, reqPB)
-			log.Infof("addNewPatches() pb.Len()=%d result.Len()=%d\n", pb.Len(), result.Len())
+			reqPB.Log = append(reqPB.Log, log.Sprintf("addNewPatches() pb.Len()=%d result.Len()=%d\n", pb.Len(), result.Len()))
 		case "/patches/applied":
-			log.Info("not really anything needs to be done on applied patches?")
-			// result = handleAppliedPatches(pb, reqPB)
+			reqPB.Log = append(reqPB.Log, log.Sprintf("not really anything needs to be done on applied patches?"))
 		case "/patches/merged":
-			log.Info("a maintainer has merged these patches")
+			reqPB.Log = append(reqPB.Log, log.Sprintf("a maintainer has merged these patches"))
 			result = handleMergedPatches(pb, reqPB)
 			// result = handleAppliedPatches(pb, reqPB)
 		case "/patches/get":
@@ -132,7 +126,7 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 			result = addNewPatches(pb, reqPB)
 		}
 		if err := result.SendReply(w, reqPB); err != nil {
-			log.Info("Oh well, Send to client failed. err =", err)
+			reqPB.Log = append(reqPB.Log, log.Sprintf("Oh well, Send to client failed. err=%v", err))
 		}
 		me.forge.SavePatchsets()
 		// todo: logReq(reqPB)
@@ -163,6 +157,12 @@ func okHandler(w http.ResponseWriter, r *http.Request) {
 	}
 	logReqPB(reqPB)
 
+	// used for uptime monitor checking
+	if route == "/uptime" {
+		writeFile(w, "uptime.html")
+		return
+	}
+
 	/*
 		if route == "/lookup" {
 			log.Info("doing lookup len(reqPB.Body) =", len(reqPB.Body))