diff options
author | Rémy Coutable <remy@rymai.me> | 2018-06-07 18:23:38 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2018-06-07 18:23:49 +0300 |
commit | 6afe6fa6bcb3bdb09bd49ba638a37af2a8c7a6ec (patch) | |
tree | 7e0ccd31a9463c5969e73697cab37cc8adfd483e /lib/gitlab/current_settings.rb | |
parent | 1bcdd25ce24f2b43f5c24f5a296ff8f81c7a0759 (diff) |
Make Gitlab::CurrentSettings.current_application_settings return cached settings early if they exist without issuing any DB query
Signed-off-by: Rémy Coutable <remy@rymai.me>
Diffstat (limited to 'lib/gitlab/current_settings.rb')
-rw-r--r-- | lib/gitlab/current_settings.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 591a985a868..3cf35f499cd 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -32,8 +32,10 @@ module Gitlab begin ::ApplicationSetting.cached - rescue ::Redis::BaseError, ::Errno::ENOENT, ::Errno::EADDRNOTAVAIL - # In case Redis isn't running or the Redis UNIX socket file is not available + rescue + # In case Redis isn't running + # or the Redis UNIX socket file is not available + # or the DB is not running (we use migrations in the cache key) end end |