diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-08 00:09:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-05-08 00:09:26 +0300 |
commit | 17c8111494f51e79744c782db023804f5e4a7410 (patch) | |
tree | 8aebe53b8aea72f9d4abac1bf9131203302a5b6e /lib/gitlab/sidekiq_logging | |
parent | 4b7575da97d88ef4c7b2ec599b0c3fc457b4f561 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/gitlab/sidekiq_logging')
-rw-r--r-- | lib/gitlab/sidekiq_logging/json_formatter.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/lib/gitlab/sidekiq_logging/json_formatter.rb b/lib/gitlab/sidekiq_logging/json_formatter.rb index 45c6842c59b..64782e1e1d1 100644 --- a/lib/gitlab/sidekiq_logging/json_formatter.rb +++ b/lib/gitlab/sidekiq_logging/json_formatter.rb @@ -19,6 +19,7 @@ module Gitlab output[:message] = data when Hash convert_to_iso8601!(data) + convert_retry_to_integer!(data) stringify_args!(data) output.merge!(data) end @@ -41,6 +42,20 @@ module Gitlab Time.at(timestamp).utc.iso8601(3) end + def convert_retry_to_integer!(payload) + payload['retry'] = + case payload['retry'] + when Integer + payload['retry'] + when false, nil + 0 + when true + Sidekiq::JobRetry::DEFAULT_MAX_RETRY_ATTEMPTS + else + -1 + end + end + def stringify_args!(payload) payload['args'] = Gitlab::Utils::LogLimitedArray.log_limited_array(payload['args'].map(&:to_s)) if payload['args'] end |