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:
authorAlex Hanselka <alex@gitlab.com>2018-12-11 00:42:50 +0300
committerAlex Hanselka <alex@gitlab.com>2018-12-11 00:42:50 +0300
commitf77888fe0857c9f4a47133f434c741a510946767 (patch)
treeb227b60894474ba2c9a8864b66e4df65763b35b8 /lib/gitlab/json_logger.rb
parentd2120ff1e705799752e7d9704cae3f1896d8e186 (diff)
parent2d7dc668506a0576e231fbe290c89e47cf088300 (diff)
Merge branch '11-6-stable-prepare-rc5' into '11-6-stable'
Prepare 11.6 RC5 release See merge request gitlab-org/gitlab-ce!23704
Diffstat (limited to 'lib/gitlab/json_logger.rb')
-rw-r--r--lib/gitlab/json_logger.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/json_logger.rb b/lib/gitlab/json_logger.rb
index 3bff77731f6..a5a5759cc89 100644
--- a/lib/gitlab/json_logger.rb
+++ b/lib/gitlab/json_logger.rb
@@ -10,6 +10,7 @@ module Gitlab
data = {}
data[:severity] = severity
data[:time] = timestamp.utc.iso8601(3)
+ data[Gitlab::CorrelationId::LOG_KEY] = Gitlab::CorrelationId.current_id
case message
when String