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
This commit is contained in:
commit
b92b7d8222
|
@ -110,6 +110,7 @@ class ApplicationController < ActionController::Base
|
||||||
def append_info_to_payload(payload)
|
def append_info_to_payload(payload)
|
||||||
super
|
super
|
||||||
|
|
||||||
|
payload[:ua] = request.env["HTTP_USER_AGENT"]
|
||||||
payload[:remote_ip] = request.remote_ip
|
payload[:remote_ip] = request.remote_ip
|
||||||
|
|
||||||
logged_user = auth_user
|
logged_user = auth_user
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
---
|
||||||
|
title: Add User-Agent to production_json.log
|
||||||
|
merge_request: 21546
|
||||||
|
author:
|
||||||
|
type: other
|
|
@ -22,7 +22,8 @@ unless Sidekiq.server?
|
||||||
params: params,
|
params: params,
|
||||||
remote_ip: event.payload[:remote_ip],
|
remote_ip: event.payload[:remote_ip],
|
||||||
user_id: event.payload[:user_id],
|
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
|
gitaly_calls = Gitlab::GitalyClient.get_request_count
|
||||||
|
|
Loading…
Reference in New Issue