diff options
| author | Jacob Vosmaer (GitLab) <jacob@gitlab.com> | 2018-03-28 12:21:32 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-03-28 12:21:32 +0300 |
| commit | c43e18fc495f66c4a96c9a72bdda72392fb0ea32 (patch) | |
| tree | 6a15efa5bb9280c76e322f9be3e8661227f58c7a /app/workers | |
| parent | 066d2e0a9cc7f6bcd56115c031168b775a2374fd (diff) | |
Remove some easy cases of 'path_to_repo' use
Diffstat (limited to 'app/workers')
| -rw-r--r-- | app/workers/git_garbage_collect_worker.rb | 9 | ||||
| -rw-r--r-- | app/workers/repository_fork_worker.rb | 1 |
2 files changed, 6 insertions, 4 deletions
diff --git a/app/workers/git_garbage_collect_worker.rb b/app/workers/git_garbage_collect_worker.rb index 55fb817ca6e..be4203bc7ad 100644 --- a/app/workers/git_garbage_collect_worker.rb +++ b/app/workers/git_garbage_collect_worker.rb @@ -28,16 +28,17 @@ class GitGarbageCollectWorker task = task.to_sym cmd = command(task) - repo_path = project.repository.path_to_repo - description = "'#{cmd.join(' ')}' in #{repo_path}" - - Gitlab::GitLogger.info(description) gitaly_migrate(GITALY_MIGRATED_TASKS[task]) do |is_enabled| if is_enabled gitaly_call(task, project.repository.raw_repository) else + repo_path = project.repository.path_to_repo + description = "'#{cmd.join(' ')}' in #{repo_path}" + Gitlab::GitLogger.info(description) + output, status = Gitlab::Popen.popen(cmd, repo_path) + Gitlab::GitLogger.error("#{description} failed:\n#{output}") unless status.zero? end end diff --git a/app/workers/repository_fork_worker.rb b/app/workers/repository_fork_worker.rb index 07584fab7c8..712a63af532 100644 --- a/app/workers/repository_fork_worker.rb +++ b/app/workers/repository_fork_worker.rb @@ -1,3 +1,4 @@ +# Gitaly issue: https://gitlab.com/gitlab-org/gitaly/issues/1110 class RepositoryForkWorker include ApplicationWorker include Gitlab::ShellAdapter |