summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2016-08-08 17:39:48 +0000
committerDouwe Maan <douwe@gitlab.com>2016-08-08 17:39:48 +0000
commit8bce4a3fde12435ad50e5c8f0c43c238cdee3e24 (patch)
tree357a7c04f58ad15e07bfa89fe1d2761ebba3a852
parent59ce1af53b8d25d1b4ae8b6e59f069c5147ca572 (diff)
parentc74005e75cf29eb14d2e9f5a2c3744b6e06ded0a (diff)
downloadgitlab-ce-8bce4a3fde12435ad50e5c8f0c43c238cdee3e24.tar.gz
Merge branch 'decode-log-postreceive-args' into 'master'
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 decoded data to the log statement. Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/20381 See merge request !5547
-rw-r--r--app/workers/post_receive.rb4
-rw-r--r--lib/gitlab/git_post_receive.rb1
2 files changed, 4 insertions, 1 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?
diff --git a/lib/gitlab/git_post_receive.rb b/lib/gitlab/git_post_receive.rb
index a088e19d1e7..d32bdd86427 100644
--- a/lib/gitlab/git_post_receive.rb
+++ b/lib/gitlab/git_post_receive.rb
@@ -39,7 +39,6 @@ module Gitlab
end
def deserialize_changes(changes)
- changes = Base64.decode64(changes) unless changes.include?(' ')
changes = utf8_encode_changes(changes)
changes.lines
end