From f26eee8431b29b76e05870b6e4edf1122f46baff Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Tue, 16 Jun 2015 17:43:36 +1000
Subject: [PATCH] FEATURE: add username to NGINX logs

---
 app/controllers/application_controller.rb | 1 +
 config/nginx.sample.conf                  | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index a1a223ff10e..bf9e764b39e 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -144,6 +144,7 @@ class ApplicationController < ActionController::Base
   def set_current_user_for_logs
     if current_user
       Logster.add_to_env(request.env,"username",current_user.username)
+      response.headers["X-Discourse-Username"] = current_user.username
     end
     response.headers["X-Discourse-Route"] = "#{controller_name}/#{action_name}"
   end
diff --git a/config/nginx.sample.conf b/config/nginx.sample.conf
index 36acdb4ec58..df8368736e9 100644
--- a/config/nginx.sample.conf
+++ b/config/nginx.sample.conf
@@ -25,7 +25,7 @@ map $http_x_forwarded_proto $thescheme {
   https https;
 }
 
-log_format log_discourse '[$time_local] $remote_addr "$request" "$http_user_agent" "$sent_http_x_discourse_route" $status $bytes_sent "$http_referer" $upstream_response_time $request_time';
+log_format log_discourse '[$time_local] $remote_addr "$request" "$http_user_agent" "$sent_http_x_discourse_route" $status $bytes_sent "$http_referer" $upstream_response_time $request_time "sent_http_x_discourse_username"';
 
 server {