summaryrefslogtreecommitdiff
path: root/qa/qa/git/repository.rb
diff options
context:
space:
mode:
authorMark Lapierre <mlapierre@gitlab.com>2018-10-25 11:49:33 -0400
committerMark Lapierre <mlapierre@gitlab.com>2018-10-25 15:21:21 -0400
commita85c8e346f0844b0bc8079e03f942f4c53776efa (patch)
treef5a51384510376ebcf5ea37f1b451a1022b702a1 /qa/qa/git/repository.rb
parent4de9004175e7c1dfd0366c41d70573d4d686b292 (diff)
downloadgitlab-ce-a85c8e346f0844b0bc8079e03f942f4c53776efa.tar.gz
Re-enable debug logging of Git commands and outputml-qa-repo-logging
Diffstat (limited to 'qa/qa/git/repository.rb')
-rw-r--r--qa/qa/git/repository.rb8
1 files changed, 2 insertions, 6 deletions
diff --git a/qa/qa/git/repository.rb b/qa/qa/git/repository.rb
index c6a8891d398..27a88534258 100644
--- a/qa/qa/git/repository.rb
+++ b/qa/qa/git/repository.rb
@@ -113,21 +113,17 @@ module QA
attr_reader :uri, :username, :password, :known_hosts_file, :private_key_file
- def debug?
- Runtime::Env.respond_to?(:verbose?) && Runtime::Env.verbose?
- end
-
def ssh_key_set?
!private_key_file.nil?
end
def run(command_str)
command = [env_vars, command_str, '2>&1'].compact.join(' ')
- warn "DEBUG: command=[#{command}]" if debug?
+ Runtime::Logger.debug "Git: command=[#{command}]"
output, _ = Open3.capture2(command)
output = output.chomp.gsub(/\s+$/, '')
- warn "DEBUG: output=[#{output}]" if debug?
+ Runtime::Logger.debug "Git: output=[#{output}]"
output
end