Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-06-18 14:18:50 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-06-18 14:18:50 +0300
commit8c7f4e9d5f36cff46365a7f8c4b9c21578c1e781 (patch)
treea77e7fe7a93de11213032ed4ab1f33a3db51b738 /app/channels/application_cable/logging.rb
parent00b35af3db1abfe813a778f643dad221aad51fca (diff)
Add latest changes from gitlab-org/gitlab@13-1-stable-ee
Diffstat (limited to 'app/channels/application_cable/logging.rb')
-rw-r--r--app/channels/application_cable/logging.rb17
1 files changed, 17 insertions, 0 deletions
diff --git a/app/channels/application_cable/logging.rb b/app/channels/application_cable/logging.rb
new file mode 100644
index 00000000000..4152f8c779f
--- /dev/null
+++ b/app/channels/application_cable/logging.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module ApplicationCable
+ module Logging
+ private
+
+ def notification_payload(_)
+ super.merge!(
+ Labkit::Correlation::CorrelationId::LOG_KEY => request.request_id,
+ user_id: current_user&.id,
+ username: current_user&.username,
+ remote_ip: request.remote_ip,
+ ua: request.env['HTTP_USER_AGENT']
+ )
+ end
+ end
+end