diff options
author | micael.bergeron <micaelbergeron@gmail.com> | 2017-11-14 09:22:15 -0500 |
---|---|---|
committer | micael.bergeron <micaelbergeron@gmail.com> | 2017-11-14 09:22:15 -0500 |
commit | 0b4a7d656b224c145072946f06539fcff40cc8ca (patch) | |
tree | acb76e9e322be05be2ec0fbb2ea535874b6289b7 /app/workers | |
parent | a579bc59b04834eed656e2d8bcf672026d2829ce (diff) | |
download | gitlab-ce-0b4a7d656b224c145072946f06539fcff40cc8ca.tar.gz |
rework the logging to be simpler and add a threshold
Diffstat (limited to 'app/workers')
-rw-r--r-- | app/workers/update_merge_requests_worker.rb | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/app/workers/update_merge_requests_worker.rb b/app/workers/update_merge_requests_worker.rb index d8d818aee8e..ab831858676 100644 --- a/app/workers/update_merge_requests_worker.rb +++ b/app/workers/update_merge_requests_worker.rb @@ -2,6 +2,8 @@ class UpdateMergeRequestsWorker include Sidekiq::Worker include DedicatedSidekiqQueue + LOG_TIME_THRESHOLD = 90 # seconds + def perform(project_id, user_id, oldrev, newrev, ref) project = Project.find_by(id: project_id) return unless project @@ -14,12 +16,16 @@ class UpdateMergeRequestsWorker MergeRequests::RefreshService.new(project, user).execute(oldrev, newrev, ref) end - log_args = ["elapsed=#{time.real}"] - method(__method__).parameters.map do |_, p| - pname = p.to_s - log_args << [pname, binding.local_variable_get(pname)].join('=') - end + args_log = [ + "elapsed=#{time.real}", + "project_id=#{project_id}", + "user_id=#{user_id}", + "oldrev=#{oldrev}", + "newrev=#{newrev}", + "ref=#{ref}" + ].join(',') - Rails.logger.info("UpdateMergeRequestsWorker#perform #{log_args.join(',')}") + Rails.logger.info("UpdateMergeRequestsWorker#perform #{args_log}") if time.real > LOG_TIME_THRESHOLD end + end |