From 9606ea28ceba1f6dc319ef6863ef132b5d71ebf3 Mon Sep 17 00:00:00 2001
From: Robert Swain <rob@matrix.org>
Date: Wed, 31 May 2017 14:30:57 +0200
Subject: [PATCH] mediaapi/writers/download: Always log origin and mediaID

---
 .../dendrite/mediaapi/writers/download.go     | 22 ++++++-------------
 1 file changed, 7 insertions(+), 15 deletions(-)

diff --git a/src/github.com/matrix-org/dendrite/mediaapi/writers/download.go b/src/github.com/matrix-org/dendrite/mediaapi/writers/download.go
index f1f74c4cd..1df286457 100644
--- a/src/github.com/matrix-org/dendrite/mediaapi/writers/download.go
+++ b/src/github.com/matrix-org/dendrite/mediaapi/writers/download.go
@@ -53,7 +53,10 @@ func Download(w http.ResponseWriter, req *http.Request, origin gomatrixserverlib
 			MediaID: mediaID,
 			Origin:  origin,
 		},
-		Logger: util.GetLogger(req.Context()),
+		Logger: util.GetLogger(req.Context()).WithFields(log.Fields{
+			"Origin":  origin,
+			"MediaID": mediaID,
+		}),
 	}
 
 	// request validation
@@ -181,8 +184,6 @@ func (r *downloadRequest) respondFromLocalFile(w http.ResponseWriter, absBasePat
 	}
 
 	r.Logger.WithFields(log.Fields{
-		"MediaID":       r.MediaMetadata.MediaID,
-		"Origin":        r.MediaMetadata.Origin,
 		"UploadName":    r.MediaMetadata.UploadName,
 		"Base64Hash":    r.MediaMetadata.Base64Hash,
 		"FileSizeBytes": r.MediaMetadata.FileSizeBytes,
@@ -214,24 +215,15 @@ func (r *downloadRequest) respondFromLocalFile(w http.ResponseWriter, absBasePat
 }
 
 func (r *downloadRequest) closeConnection(w http.ResponseWriter) {
-	r.Logger.WithFields(log.Fields{
-		"Origin":  r.MediaMetadata.Origin,
-		"MediaID": r.MediaMetadata.MediaID,
-	}).Info("Attempting to close the connection.")
+	r.Logger.Info("Attempting to close the connection.")
 	hijacker, ok := w.(http.Hijacker)
 	if ok {
 		connection, _, hijackErr := hijacker.Hijack()
 		if hijackErr == nil {
-			r.Logger.WithFields(log.Fields{
-				"Origin":  r.MediaMetadata.Origin,
-				"MediaID": r.MediaMetadata.MediaID,
-			}).Info("Closing")
+			r.Logger.Info("Closing")
 			connection.Close()
 		} else {
-			r.Logger.WithError(hijackErr).WithFields(log.Fields{
-				"Origin":  r.MediaMetadata.Origin,
-				"MediaID": r.MediaMetadata.MediaID,
-			}).Warn("Error trying to hijack and close connection")
+			r.Logger.WithError(hijackErr).Warn("Error trying to hijack and close connection")
 		}
 	}
 }