diff options
author | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-12-04 10:31:13 +0100 |
---|---|---|
committer | Kim "BKC" Carlbäcker <kim.carlbacker@gmail.com> | 2017-12-04 15:57:20 +0100 |
commit | 12f61e0d2cabb07172ef93143b084104141dd771 (patch) | |
tree | 27692688b55c3febe22122f1d18aa5c80bea47d0 /app/workers/repository_check/single_repository_worker.rb | |
parent | e0f84130567dc34edf1ae75fcf595e24991d2fa9 (diff) | |
download | gitlab-ce-12f61e0d2cabb07172ef93143b084104141dd771.tar.gz |
Move SingleRepositoryWorker#fsck into Gitlab::Git::Repository
Diffstat (limited to 'app/workers/repository_check/single_repository_worker.rb')
-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) |