summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorYorick Peterse <yorickpeterse@gmail.com>2016-09-30 12:32:18 +0000
committerYorick Peterse <yorickpeterse@gmail.com>2016-09-30 12:32:18 +0000
commitb9daced7a2814fa74a3f0dddf38858100678c6b1 (patch)
tree4120bf0d5d747f731aa52f5dbf4264ccdbcd7ffb /config
parentd0ef55624c017e1bf28af42f457af0aeec26967c (diff)
parent52ee85e7bf35d372285d70cc93016854774839b1 (diff)
downloadgitlab-ce-b9daced7a2814fa74a3f0dddf38858100678c6b1.tar.gz
Merge branch 'initialize-redis' into 'master'
Initialize Redis pool in single-threaded context See merge request !6613
Diffstat (limited to 'config')
-rw-r--r--config/initializers/7_redis.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/config/initializers/7_redis.rb b/config/initializers/7_redis.rb
new file mode 100644
index 00000000000..ae2ca258df1
--- /dev/null
+++ b/config/initializers/7_redis.rb
@@ -0,0 +1,3 @@
+# Make sure we initialize a Redis connection pool before Sidekiq starts
+# multi-threaded execution.
+Gitlab::Redis.with { nil }