diff options
| author | Sean McGivern <sean@mcgivern.me.uk> | 2018-09-06 08:30:25 +0000 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-09-06 08:30:25 +0000 |
| commit | b92b7d822226724db76b8dfb61dca438ea8dbb1c (patch) | |
| tree | 5240a0b9bf3fc2d836e0c254197c9844511c3fd8 | |
| parent | 172c2d51392c92775b74c0529758e0cf3faedc27 (diff) | |
| parent | 93005b4e811a41da2c845b7c1ab558625c338a72 (diff) | |
| download | gitlab-ce-b92b7d822226724db76b8dfb61dca438ea8dbb1c.tar.gz | |
Merge branch 'sh-add-ua-to-lograge-logs' into 'master'
Add User-Agent to production_json.log
See merge request gitlab-org/gitlab-ce!21546
| -rw-r--r-- | app/controllers/application_controller.rb | 1 | ||||
| -rw-r--r-- | changelogs/unreleased/sh-add-ua-to-lograge-logs.yml | 5 | ||||
| -rw-r--r-- | config/initializers/lograge.rb | 3 |
3 files changed, 8 insertions, 1 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index e5b38898a67..7cd68d6b92a 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -110,6 +110,7 @@ class ApplicationController < ActionController::Base def append_info_to_payload(payload) super + payload[:ua] = request.env["HTTP_USER_AGENT"] payload[:remote_ip] = request.remote_ip logged_user = auth_user diff --git a/changelogs/unreleased/sh-add-ua-to-lograge-logs.yml b/changelogs/unreleased/sh-add-ua-to-lograge-logs.yml new file mode 100644 index 00000000000..eec55bd3a24 --- /dev/null +++ b/changelogs/unreleased/sh-add-ua-to-lograge-logs.yml @@ -0,0 +1,5 @@ +--- +title: Add User-Agent to production_json.log +merge_request: 21546 +author: +type: other diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb index 1cf8a24e98c..840404e0ec0 100644 --- a/config/initializers/lograge.rb +++ b/config/initializers/lograge.rb @@ -22,7 +22,8 @@ unless Sidekiq.server? params: params, remote_ip: event.payload[:remote_ip], user_id: event.payload[:user_id], - username: event.payload[:username] + username: event.payload[:username], + ua: event.payload[:ua] } gitaly_calls = Gitlab::GitalyClient.get_request_count |