Log serving type used for requestslog-serving-type

This extends our structured logging
with information about how the given
request was served

1 files changed, 11 insertions, 7 deletions

diff --git a/internal/logging/logging.go b/internal/logging/logging.go
index 3432cdf7..6643e169 100644
--- a/internal/logging/logging.go
+++ b/internal/logging/logging.go
@@ -53,16 +53,20 @@ func getAccessLogger(format string) (*logrus.Logger, error) {
 // getExtraLogFields is used to inject additional fields into the
 // HTTP access logger middleware.
 func getExtraLogFields(r *http.Request) log.Fields {
-	var projectID uint64
-	if d := request.GetDomain(r); d != nil {
-		projectID = d.GetProjectID(r)
+	logFields := log.Fields{
+		"pages_https": request.IsHTTPS(r),
+		"pages_host":  request.GetHost(r),
 	}
 
-	return log.Fields{
-		"pages_https":      request.IsHTTPS(r),
-		"pages_host":       request.GetHost(r),
-		"pages_project_id": projectID,
+	if d := request.GetDomain(r); d != nil {
+		if lp := d.GetLookupPath(r); lp != nil {
+			logFields["pages_project_serving_type"] = lp.ServingType
+			logFields["pages_project_prefix"] = lp.Prefix
+			logFields["pages_project_id"] = lp.ProjectID
+		}
 	}
+
+	return logFields
 }
 
 // BasicAccessLogger configures the GitLab pages basic HTTP access logger middleware