diff options
author | Douwe Maan <douwe@gitlab.com> | 2017-12-04 15:58:53 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2017-12-04 15:58:53 +0000 |
commit | a1cd9be42910c89192e82659c09bf0242c8e5dae (patch) | |
tree | 40378af8cfd79c61f1b692a852d0f54ce571bf0e /app | |
parent | 0f3f50d188e5c3f458d65b91765f080288cb06ab (diff) | |
parent | 12f61e0d2cabb07172ef93143b084104141dd771 (diff) | |
download | gitlab-ce-a1cd9be42910c89192e82659c09bf0242c8e5dae.tar.gz |
Merge branch 'git-fsck-worker-client-prep' into 'master'
Move SingleRepositoryWorker#fsck into Gitlab::Git::Repository
Closes gitaly#802
See merge request gitlab-org/gitlab-ce!15710
Diffstat (limited to 'app')
-rw-r--r-- | app/workers/repository_check/single_repository_worker.rb | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/app/workers/repository_check/single_repository_worker.rb b/app/workers/repository_check/single_repository_worker.rb index 164586cf0b7..3d4bee15f1c 100644 --- a/app/workers/repository_check/single_repository_worker.rb +++ b/app/workers/repository_check/single_repository_worker.rb @@ -32,16 +32,14 @@ module RepositoryCheck end def git_fsck(repository) - path = repository.path_to_repo - cmd = %W(nice git --git-dir=#{path} fsck) - output, status = Gitlab::Popen.popen(cmd) + return false unless repository.exists? - if status.zero? - true - else - Gitlab::RepositoryCheckLogger.error("command failed: #{cmd.join(' ')}\n#{output}") - false - end + repository.raw_repository.fsck + + true + rescue Gitlab::Git::Repository::GitError => e + Gitlab::RepositoryCheckLogger.error(e.message) + false end def has_pushes?(project) |