Fix bad access log

middlewares/accesslog/logger_formatters.go

@@ -31,19 +31,19 @@ func (f *CommonLogFormatter) Format(entry *logrus.Entry) ([]byte, error) {
 		entry.Data[RequestMethod],
 		entry.Data[RequestPath],
 		entry.Data[RequestProtocol],
-		toLog(entry.Data[OriginStatus]),
-		toLog(entry.Data[OriginContentSize]),
-		toLog(entry.Data["request_Referer"]),
-		toLog(entry.Data["request_User-Agent"]),
-		toLog(entry.Data[RequestCount]),
-		toLog(entry.Data[FrontendName]),
-		toLog(entry.Data[BackendURL]),
+		toLog(entry.Data[OriginStatus], defaultValue),
+		toLog(entry.Data[OriginContentSize], defaultValue),
+		toLog(entry.Data["request_Referer"], `"-"`),
+		toLog(entry.Data["request_User-Agent"], `"-"`),
+		toLog(entry.Data[RequestCount], defaultValue),
+		toLog(entry.Data[FrontendName], defaultValue),
+		toLog(entry.Data[BackendURL], defaultValue),
 		elapsedMillis)
 
 	return b.Bytes(), err
 }
 
-func toLog(v interface{}) interface{} {
+func toLog(v interface{}, defaultValue string) interface{} {
 	if v == nil {
 		return defaultValue
 	}

middlewares/accesslog/logger_formatters_test.go

@@ -35,7 +35,7 @@ func TestCommonLogFormatter_Format(t *testing.T) {
 				FrontendName:         "",
 				BackendURL:           "",
 			},
-			expectedLog: `10.0.0.1 - Client [10/Nov/2009:23:00:00 +0000] "GET /foo http" - - - - 0 - - 123000ms
+			expectedLog: `10.0.0.1 - Client [10/Nov/2009:23:00:00 +0000] "GET /foo http" - - "-" "-" 0 - - 123000ms
 `,
 		},
 		{
@@ -106,7 +106,7 @@ func Test_toLog(t *testing.T) {
 		t.Run(test.name, func(t *testing.T) {
 			t.Parallel()
 
-			lg := toLog(test.value)
+			lg := toLog(test.value, defaultValue)
 
 			assert.Equal(t, test.expectedLog, lg)
 		})

middlewares/accesslog/save_backend.go

@@ -64,18 +64,13 @@ func (sb *SaveFrontend) ServeHTTP(rw http.ResponseWriter, r *http.Request) {
 	sb.next.ServeHTTP(rw, r)
 }
 
-//-------------------------------------------------------------------------------------------------
-// the next 3 function (SaveNegroniFrontend, NewSaveNegroniFrontend, ServeHTTP) are temporary,
-// DON'T USE THIS FUNCTION, MUST BE SUPPRESS BEFORE MERGING #1485
-
-// SaveNegroniFrontend sends the frontend name to the logger. These are sometimes used with a corresponding
-// SaveBackend handler, but not always. For example, redirected requests don't reach a backend.
+// SaveNegroniFrontend sends the frontend name to the logger.
 type SaveNegroniFrontend struct {
 	next         negroni.Handler
 	frontendName string
 }
 
-// NewSaveNegroniFrontend creates a SaveFrontend handler.
+// NewSaveNegroniFrontend creates a SaveNegroniFrontend handler.
 func NewSaveNegroniFrontend(next negroni.Handler, frontendName string) negroni.Handler {
 	return &SaveNegroniFrontend{next, frontendName}
 }
@@ -87,4 +82,32 @@ func (sb *SaveNegroniFrontend) ServeHTTP(rw http.ResponseWriter, r *http.Request
 	sb.next.ServeHTTP(rw, r, next)
 }
 
-//-------------------------------------------------------------------------------------------------
+// SaveNegroniBackend sends the backend name to the logger.
+type SaveNegroniBackend struct {
+	next        negroni.Handler
+	backendName string
+}
+
+// NewSaveNegroniBackend creates a SaveBackend handler.
+func NewSaveNegroniBackend(next negroni.Handler, backendName string) negroni.Handler {
+	return &SaveNegroniBackend{next, backendName}
+}
+
+func (sb *SaveNegroniBackend) ServeHTTP(rw http.ResponseWriter, r *http.Request, next http.HandlerFunc) {
+	table := GetLogDataTable(r)
+	table.Core[BackendName] = sb.backendName
+
+	crw := &captureResponseWriter{rw: rw}
+	start := time.Now().UTC()
+
+	sb.next.ServeHTTP(crw, r, next)
+
+	// use UTC to handle switchover of daylight saving correctly
+	table.Core[OriginDuration] = time.Now().UTC().Sub(start)
+	table.Core[OriginStatus] = crw.Status()
+	table.Core[OriginStatusLine] = fmt.Sprintf("%03d %s", crw.Status(), http.StatusText(crw.Status()))
+	// make copy of headers so we can ensure there is no subsequent mutation during response processing
+	table.OriginResponse = make(http.Header)
+	utils.CopyHeaders(table.OriginResponse, crw.Header())
+	table.Core[OriginContentSize] = crw.Size()
+}