diff options
| author | Stan Hu <stanhu@gmail.com> | 2016-12-01 15:43:02 +0000 |
|---|---|---|
| committer | Stan Hu <stanhu@gmail.com> | 2016-12-01 15:43:02 +0000 |
| commit | cf1a31a3459786f637971e2dafe4df31f5a28e74 (patch) | |
| tree | 2a9cac223872524a788d41ebe07f24c10f4c1240 | |
| parent | fd2a429f35f521c7ab3b2b868d0e7ad55b6cbbba (diff) | |
| parent | fe0de99c4e893a30029dc03df582550cf32e8b19 (diff) | |
| download | gitlab-ce-cf1a31a3459786f637971e2dafe4df31f5a28e74.tar.gz | |
Merge branch 'rescue-from-redis-init-errors' into 'master'
Gracefully recover from Redis connection failures in Sidekiq initializer
Precompiling assets and other Rake tasks would fail if Redis were not available in certain cases.
* Closes gitlab-org/gitlab-ce#25143
* Closes gitlab-org/omnibus-gitlab#1743
See merge request !7835
| -rw-r--r-- | changelogs/unreleased/rescue-from-redis-init-errors.yml | 4 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changelogs/unreleased/rescue-from-redis-init-errors.yml b/changelogs/unreleased/rescue-from-redis-init-errors.yml new file mode 100644 index 00000000000..c41f49597e7 --- /dev/null +++ b/changelogs/unreleased/rescue-from-redis-init-errors.yml @@ -0,0 +1,4 @@ +--- +title: Gracefully recover from Redis connection failures in Sidekiq initializer +merge_request: +author: diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index b87b31d9697..1d7a3f03ace 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -61,5 +61,5 @@ begin end end end -rescue Redis::BaseError, SocketError +rescue Redis::BaseError, SocketError, Errno::ENOENT, Errno::EAFNOSUPPORT, Errno::ECONNRESET, Errno::ECONNREFUSED end |