summaryrefslogtreecommitdiff
path: root/app/workers
diff options
context:
space:
mode:
authorJacob Vosmaer <jacob@gitlab.com>2016-07-28 15:12:49 +0200
committerJacob Vosmaer <jacob@gitlab.com>2016-08-05 15:00:12 +0200
commitc74005e75cf29eb14d2e9f5a2c3744b6e06ded0a (patch)
tree46237e9ebefd2b890b8a302e6cf0228d605d0c0c /app/workers
parentaed644ccc084223cb1f9c5d955569c5ff9eeaf88 (diff)
downloadgitlab-ce-c74005e75cf29eb14d2e9f5a2c3744b6e06ded0a.tar.gz
Log base64-decoded PostReceive arguments
The change to base64-encoding the third argument to PostReceive in gitlab-shell made our Sidekiq ArgumentsLogger a little less useful. This change adds a log statement for the decoded data. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20381
Diffstat (limited to 'app/workers')
-rw-r--r--app/workers/post_receive.rb4
1 files changed, 4 insertions, 0 deletions
diff --git a/app/workers/post_receive.rb b/app/workers/post_receive.rb
index 09035a7cf2d..a9a2b716005 100644
--- a/app/workers/post_receive.rb
+++ b/app/workers/post_receive.rb
@@ -10,6 +10,10 @@ class PostReceive
log("Check gitlab.yml config for correct repositories.storages values. No repository storage path matches \"#{repo_path}\"")
end
+ changes = Base64.decode64(changes) unless changes.include?(' ')
+ # Use Sidekiq.logger so arguments can be correlated with execution
+ # time and thread ID's.
+ Sidekiq.logger.info "changes: #{changes.inspect}" if ENV['SIDEKIQ_LOG_ARGUMENTS']
post_received = Gitlab::GitPostReceive.new(repo_path, identifier, changes)
if post_received.project.nil?