diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-26 15:09:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-04-26 15:09:44 +0300 |
| commit | e5e0589e097991ca671a348de81331240e85719d (patch) | |
| tree | 0767e6d3388f6ebf65f5d47a3ecb0d52430fa7da /app/models/concerns/cacheable_attributes.rb | |
| parent | 0ccabeb3f62c5fbc81f52cc16fa654404bb87874 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/models/concerns/cacheable_attributes.rb')
| -rw-r--r-- | app/models/concerns/cacheable_attributes.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/concerns/cacheable_attributes.rb b/app/models/concerns/cacheable_attributes.rb index ee56322cce7..f3b47047c55 100644 --- a/app/models/concerns/cacheable_attributes.rb +++ b/app/models/concerns/cacheable_attributes.rb @@ -53,7 +53,7 @@ module CacheableAttributes return cached_record if cached_record.present? current_without_cache.tap { |current_record| current_record&.cache! } - rescue => e + rescue StandardError => e if Rails.env.production? Gitlab::AppLogger.warn("Cached record for #{name} couldn't be loaded, falling back to uncached record: #{e}") else @@ -66,7 +66,7 @@ module CacheableAttributes def expire Gitlab::SafeRequestStore.delete(request_store_cache_key) cache_backend.delete(cache_key) - rescue + rescue StandardError # Gracefully handle when Redis is not available. For example, # omnibus may fail here during gitlab:assets:compile. end |