diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 21:08:05 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-10-17 21:08:05 +0300 |
| commit | 184c2ced0761bd8dd7032619d16d3983fed7944a (patch) | |
| tree | cc82b32ee7c1797509da3cf384617e4ffa2e1733 /config | |
| parent | 238d22c07218adf2b8f3db630ee8b74ca6f29df5 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/lograge.rb | 4 | ||||
| -rw-r--r-- | config/sidekiq_queues.yml | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/initializers/lograge.rb b/config/initializers/lograge.rb index 346725e4080..d5d4c589884 100644 --- a/config/initializers/lograge.rb +++ b/config/initializers/lograge.rb @@ -32,6 +32,10 @@ unless Sidekiq.server? payload[:response] = event.payload[:response] if event.payload[:response] payload[Labkit::Correlation::CorrelationId::LOG_KEY] = Labkit::Correlation::CorrelationId.current_id + if cpu_s = Gitlab::Metrics::System.thread_cpu_duration(::Gitlab::RequestContext.start_thread_cpu_time) + payload[:cpu_s] = cpu_s + end + payload end end diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml index 8ca7ab4dcb1..b97e8ad67c9 100644 --- a/config/sidekiq_queues.yml +++ b/config/sidekiq_queues.yml @@ -24,6 +24,7 @@ - [process_commit, 3] - [new_note, 2] - [new_issue, 2] + - [notifications, 2] - [new_merge_request, 2] - [pipeline_processing, 5] - [pipeline_creation, 4] |