summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorJacob Vosmaer <contact@jacobvosmaer.nl>2014-12-08 13:39:25 +0100
committerJacob Vosmaer <contact@jacobvosmaer.nl>2014-12-08 13:39:25 +0100
commitb8dfd63eacc26bb2ef6a900b75e794c33cf2c9ca (patch)
tree412ba324b74845a5b7ff30a1d77651a78fdf8f76 /config
parent2fcef3278ce4ccb62cefa590b0f65509028fbcc0 (diff)
downloadgitlab-ce-b8dfd63eacc26bb2ef6a900b75e794c33cf2c9ca.tar.gz
Use the new SIDEKIQ_MEMORY_KILLER_MAX_RSS variable
Diffstat (limited to 'config')
-rw-r--r--config/initializers/4_sidekiq.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/4_sidekiq.rb b/config/initializers/4_sidekiq.rb
index 75c543c0f47..e856499732e 100644
--- a/config/initializers/4_sidekiq.rb
+++ b/config/initializers/4_sidekiq.rb
@@ -15,7 +15,7 @@ Sidekiq.configure_server do |config|
config.server_middleware do |chain|
chain.add Gitlab::SidekiqMiddleware::ArgumentsLogger if ENV['SIDEKIQ_LOG_ARGUMENTS']
- chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MAX_RSS']
+ chain.add Gitlab::SidekiqMiddleware::MemoryKiller if ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS']
end
end