Commit b8443a9c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Improve logging for git-annex

parent a3702179
...@@ -72,12 +72,13 @@ class GitlabShell ...@@ -72,12 +72,13 @@ class GitlabShell
def process_cmd def process_cmd
repo_full_path = File.join(repos_path, repo_name) repo_full_path = File.join(repos_path, repo_name)
$logger.info "gitlab-shell: executing git command <#{@git_cmd} #{repo_full_path}> for #{log_username}."
if @git_cmd == 'git-annex-shell' if @git_cmd == 'git-annex-shell'
args = Shellwords.shellwords(@origin_cmd) args = Shellwords.shellwords(@origin_cmd)
parsed_args = parsed_args =
args.map do |arg| args.map do |arg|
# Convert /~/group/project.git to group/project.git
# to make git annex path compatible with gitlab-shell
if arg =~ /\A\/~\/.*\.git\Z/ if arg =~ /\A\/~\/.*\.git\Z/
repo_full_path repo_full_path
else else
...@@ -85,8 +86,10 @@ class GitlabShell ...@@ -85,8 +86,10 @@ class GitlabShell
end end
end end
$logger.info "gitlab-shell: executing git-annex command <#{parsed_args.join(' ')}> for #{log_username}."
exec_cmd(*parsed_args) exec_cmd(*parsed_args)
else else
$logger.info "gitlab-shell: executing git command <#{@git_cmd} #{repo_full_path}> for #{log_username}."
exec_cmd(@git_cmd, repo_full_path) exec_cmd(@git_cmd, repo_full_path)
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment