Allow duration to be hidden at end of request

Added a bool, HideDuration, to the LogRequest struct that will
hide the duration output at the end of the request if set to true.

Author: aaronvb

logrequest.go

@@ -10,11 +10,12 @@ import (
 // LogRequest struct
 // Pass values from middleware to this struct
 type LogRequest struct {
-	Writer    http.ResponseWriter
-	Request   *http.Request
-	Handler   http.Handler
-	NewLine   int
-	Timestamp bool
+	Writer       http.ResponseWriter
+	Request      *http.Request
+	Handler      http.Handler
+	NewLine      int
+	Timestamp    bool
+	HideDuration bool
 }
 
 type statusWriter struct {
@@ -30,8 +31,13 @@ func (lr LogRequest) ToLogger(logger *log.Logger) {
 		logger.Printf(`Started %s "%s" %s %s`, lr.Request.Method, lr.Request.URL.RequestURI(), lr.Request.RemoteAddr, lr.Request.Proto)
 	}
 
-	sw, completedDuration := lr.parseRequest()
-	logger.Printf("Completed %d in %s", sw.statusCode, completedDuration)
+	if lr.HideDuration {
+		sw, _ := lr.parseRequest()
+		logger.Printf("Completed %d", sw.statusCode)
+	} else {
+		sw, completedDuration := lr.parseRequest()
+		logger.Printf("Completed %d in %s", sw.statusCode, completedDuration)
+	}
 
 	if lr.NewLine > 0 {
 		for i := 1; i <= lr.NewLine; i++ {
@@ -52,7 +58,11 @@ func (lr LogRequest) ToString() map[string]string {
 		ts["started"] = fmt.Sprintf(`Started %s "%s" %s %s`, lr.Request.Method, lr.Request.URL.RequestURI(), lr.Request.RemoteAddr, lr.Request.Proto)
 	}
 
-	ts["completed"] = fmt.Sprintf("Completed %d in %s", sw.statusCode, completedDuration)
+	if lr.HideDuration {
+		ts["completed"] = fmt.Sprintf("Completed %d", sw.statusCode)
+	} else {
+		ts["completed"] = fmt.Sprintf("Completed %d in %s", sw.statusCode, completedDuration)
+	}
 
 	return ts
 }

logrequest_test.go

@@ -87,6 +87,11 @@ func TestToLoggerWithOptionals(t *testing.T) {
 	if strings.Contains(str.String(), expectedCompletedResults) == false {
 		t.Errorf("Expected output was incorrect, %s does not contain new line", str.String())
 	}
+
+	notExpectedDurationResults := fmt.Sprintf(`Completed %d in`, http.StatusOK)
+	if strings.Contains(str.String(), notExpectedDurationResults) == true {
+		t.Errorf("Expected output was incorrect, %s should not contain %s", str.String(), notExpectedDurationResults)
+	}
 }
 
 func TestToString(t *testing.T) {
@@ -160,6 +165,11 @@ func TestToStringWithOptionals(t *testing.T) {
 	if strings.Contains(str.String(), expectedStartedResults) == false {
 		t.Errorf("Expected output was incorrect, %s does not contain %s", str.String(), expectedStartedResults)
 	}
+
+	notExpectedDurationResults := fmt.Sprintf(`Completed %d in`, http.StatusOK)
+	if strings.Contains(str.String(), notExpectedDurationResults) == true {
+		t.Errorf("Expected output was incorrect, %s should not contain %s", str.String(), notExpectedDurationResults)
+	}
 }
 
 // Helpers
@@ -185,14 +195,14 @@ func (app *application) logRequestToString(next http.Handler) http.Handler {
 
 func (app *application) logRequestToLoggerWithOptionals(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		lr := LogRequest{Request: r, Writer: w, Handler: next, NewLine: 1, Timestamp: true}
+		lr := LogRequest{Request: r, Writer: w, Handler: next, NewLine: 1, Timestamp: true, HideDuration: true}
 		lr.ToLogger(app.infoLog)
 	})
 }
 
 func (app *application) logRequestToStringWithOptionals(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		lr := LogRequest{Request: r, Writer: w, Handler: next, Timestamp: true}
+		lr := LogRequest{Request: r, Writer: w, Handler: next, Timestamp: true, HideDuration: true}
 		app.infoLog.Println(lr.ToString()["started"])
 		app.infoLog.Println(lr.ToString()["completed"])
 	})