diff options
| author | Nick Thomas <nick@gitlab.com> | 2017-07-10 15:29:16 +0300 |
|---|---|---|
| committer | Nick Thomas <nick@gitlab.com> | 2017-07-10 17:40:51 +0300 |
| commit | aeb2869f666a73a039b5ac05bc5973547456ee33 (patch) | |
| tree | d68a0bc1bcc0188e7847c4f9953da6ab9e534e10 /lib/gitlab/current_settings.rb | |
| parent | cd735170d3bc5e71d46ba1e37249ae713b7842f8 (diff) | |
Prevent bad data being added to application settings when Redis is unavailable
Diffstat (limited to 'lib/gitlab/current_settings.rb')
| -rw-r--r-- | lib/gitlab/current_settings.rb | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 818b3d9c46b..791a3c36476 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -33,12 +33,7 @@ module Gitlab def uncached_application_settings return fake_application_settings unless connect_to_db? - # This loads from the database into the cache, so handle Redis errors - begin - db_settings = ::ApplicationSetting.current - rescue ::Redis::BaseError, ::Errno::ENOENT - # In case Redis isn't running or the Redis UNIX socket file is not available - end + db_settings = ::ApplicationSetting.current # If there are pending migrations, it's possible there are columns that # need to be added to the application settings. To prevent Rake tasks |