Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Provaznik <jprovaznik@gitlab.com>2019-06-10 19:09:40 +0300
committerKamil TrzciƄski <ayufan@ayufan.eu>2019-06-10 19:09:40 +0300
commit497acb167078d62c0cec7bc5ff9be1be6cd2fe4a (patch)
tree659d933f1173b00b44200f006eb6dae02fa29f56 /spec/rack_servers
parentd5e8e1ef1341c65fe9105c38b9532239462ace9d (diff)
Add metric for measuring PumaWorkerKiller activity
PumaWorkerKiller is used for periodically checking and killing workers (the biggest one) if overall memory reaches specified limit. This metric allows us to watch number of killed workers.
Diffstat (limited to 'spec/rack_servers')
-rw-r--r--spec/rack_servers/puma_spec.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/rack_servers/puma_spec.rb b/spec/rack_servers/puma_spec.rb
index 8290473821c..a4b37905af3 100644
--- a/spec/rack_servers/puma_spec.rb
+++ b/spec/rack_servers/puma_spec.rb
@@ -20,7 +20,7 @@ describe 'Puma' do
File.write(config_path, config_lines)
cmd = %W[puma -e test -C #{config_path} #{File.join(__dir__, 'configs/config.ru')}]
- @puma_master_pid = spawn(*cmd)
+ @puma_master_pid = spawn({ 'DISABLE_PUMA_WORKER_KILLER' => '1' }, *cmd)
wait_puma_boot!(@puma_master_pid, File.join(project_root, 'tmp/tests/puma-worker-ready'))
WebMock.allow_net_connect!
end