diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-29 03:07:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-29 03:07:44 +0300 |
| commit | e56fd471503e00167ca96e7792f75a0d1f3b7891 (patch) | |
| tree | 87b8b69ea03c78beb5be85c5080c73f601ecc718 /lib/gitlab/sidekiq_logging | |
| parent | 8831c2df7fa3f1bb567e284e4b8c0a4f441e74b3 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_logging')
| -rw-r--r-- | lib/gitlab/sidekiq_logging/structured_logger.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/gitlab/sidekiq_logging/structured_logger.rb b/lib/gitlab/sidekiq_logging/structured_logger.rb index b45014d283f..72820d0a25e 100644 --- a/lib/gitlab/sidekiq_logging/structured_logger.rb +++ b/lib/gitlab/sidekiq_logging/structured_logger.rb @@ -85,7 +85,11 @@ module Gitlab job['pid'] = ::Process.pid job.delete('args') unless ENV['SIDEKIQ_LOG_ARGUMENTS'] - job['args'] = Gitlab::Utils::LogLimitedArray.log_limited_array(job['args']) if job['args'] + + if job['args'] + job['args'].map!(&:to_s) + job['args'] = Gitlab::Utils::LogLimitedArray.log_limited_array(job['args']) + end job end |