Commit cf1a31a3 authored by Stan Hu's avatar Stan Hu

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
parents fd2a429f fe0de99c
---
title: Gracefully recover from Redis connection failures in Sidekiq initializer
merge_request:
author:
......@@ -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
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment