diff options
| author | Stan Hu <stanhu@gmail.com> | 2018-12-07 18:29:00 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2018-12-07 18:29:00 +0300 |
| commit | e17ccef5cadd7b8962a10bb43b1332658a54bd96 (patch) | |
| tree | 05288b33ef4b4965e38a12c629041a4a6ad9d619 /config/initializers/lograge.rb | |
| parent | cda291f0c35d3724d2df916fcd95e00e84f469cf (diff) | |
| parent | eb33ca49b8a402b347592c6cf982fb7619218370 (diff) | |
Merge branch 'store-correlation-logs' into 'master'
Log and pass correlation-id between Unicorn, Sidekiq and Gitaly
See merge request gitlab-org/gitlab-ce!22844
Diffstat (limited to 'config/initializers/lograge.rb')
| -rw-r--r-- | config/initializers/lograge.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb index 840404e0ec0..c897bc30e76 100644 --- a/config/initializers/lograge.rb +++ b/config/initializers/lograge.rb @@ -29,6 +29,7 @@ unless Sidekiq.server? gitaly_calls = Gitlab::GitalyClient.get_request_count payload[:gitaly_calls] = gitaly_calls if gitaly_calls > 0 payload[:response] = event.payload[:response] if event.payload[:response] + payload[Gitlab::CorrelationId::LOG_KEY] = Gitlab::CorrelationId.current_id payload end |