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>

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