diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-07-10 18:55:08 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-11 17:38:37 +0300 |
| commit | 474bf6a725a5039ca52c8ab476641ff291eb845a (patch) | |
| tree | dd8bd2343ba55ebafeed737b6e8553e578b49b17 /lib | |
| parent | e3231f8ef8a41b8cb8fc6edcb3e88f6f13bf0f84 (diff) | |
Merge branch '34728-fix-application-setting-created-when-redis-down' into 'master'
Prevent bad data being added to application settings when Redis is unavailable
Closes #34728
See merge request !12750
Diffstat (limited to 'lib')
| -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 |