diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-07-30 16:20:27 +0300 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2019-07-30 17:03:45 +0300 |
| commit | 3b76d2982f2fdacdce5842c68ab3ba68b6cb7842 (patch) | |
| tree | 1d4df8b9fac66ae93aa1b83445d2dc061355dc94 /lib/gitlab/gitaly_client.rb | |
| parent | 11f82c891ab82620982ef157d3a6783ee56a6997 (diff) | |
Fix exception handling in Gitaly autodetection
In SELinux, the file cannot be written, and `Errno::EACCES`, not
`Errno::ACCESS` is thrown.
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/65328
Diffstat (limited to 'lib/gitlab/gitaly_client.rb')
| -rw-r--r-- | lib/gitlab/gitaly_client.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/gitlab/gitaly_client.rb b/lib/gitlab/gitaly_client.rb index c98de722fe1..4783832961d 100644 --- a/lib/gitlab/gitaly_client.rb +++ b/lib/gitlab/gitaly_client.rb @@ -413,7 +413,7 @@ module Gitlab metadata_file = File.read(storage_metadata_file_path(storage)) metadata_hash = JSON.parse(metadata_file) metadata_hash['gitaly_filesystem_id'] - rescue Errno::ENOENT, Errno::ACCESS, JSON::ParserError + rescue Errno::ENOENT, Errno::EACCES, JSON::ParserError nil end |