diff options
| author | Stan Hu <stanhu@gmail.com> | 2017-07-10 23:00:06 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2017-07-10 23:00:06 +0000 |
| commit | 4daa6da5407d235cbe4f7a787eaa29304446a870 (patch) | |
| tree | 2094291da16a3c4021176f7441b865970cfeccf8 | |
| parent | 26b6e299e1c97b956306572c5c9f6c02f428bfd7 (diff) | |
| parent | e643c0db35617d2b0ba607708322e827c15ce132 (diff) | |
| download | gitlab-ce-4daa6da5407d235cbe4f7a787eaa29304446a870.tar.gz | |
Merge branch 'catch-redis-address-error' into 'master'
Catch redis address error
Closes omnibus-gitlab#2545
See merge request !12542
| -rw-r--r-- | config/initializers/sidekiq.rb | 2 | ||||
| -rw-r--r-- | lib/gitlab/current_settings.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index ecd73956488..3be4cd797aa 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -74,5 +74,5 @@ begin end end end -rescue Redis::BaseError, SocketError, Errno::ENOENT, Errno::EAFNOSUPPORT, Errno::ECONNRESET, Errno::ECONNREFUSED +rescue Redis::BaseError, SocketError, Errno::ENOENT, Errno::EADDRNOTAVAIL, Errno::EAFNOSUPPORT, Errno::ECONNRESET, Errno::ECONNREFUSED end diff --git a/lib/gitlab/current_settings.rb b/lib/gitlab/current_settings.rb index 791a3c36476..7fa02f3d7b3 100644 --- a/lib/gitlab/current_settings.rb +++ b/lib/gitlab/current_settings.rb @@ -25,7 +25,7 @@ module Gitlab def cached_application_settings begin ::ApplicationSetting.cached - rescue ::Redis::BaseError, ::Errno::ENOENT + rescue ::Redis::BaseError, ::Errno::ENOENT, ::Errno::EADDRNOTAVAIL # In case Redis isn't running or the Redis UNIX socket file is not available end end |