mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-09 04:36:11 +10:00
Add unicorn-worker-killer with memory check
Conflicts: Gemfile.lock
This commit is contained in:
@@ -86,6 +86,7 @@ gem "asciidoctor"
|
||||
|
||||
# Application server
|
||||
gem "unicorn", '~> 4.6.3', group: :unicorn
|
||||
gem 'unicorn-worker-killer', group: :unicorn
|
||||
|
||||
# State machine
|
||||
gem "state_machine"
|
||||
|
||||
@@ -539,6 +539,8 @@ GEM
|
||||
kgio (~> 2.6)
|
||||
rack
|
||||
raindrops (~> 0.7)
|
||||
unicorn-worker-killer (0.4.2)
|
||||
unicorn (~> 4)
|
||||
virtus (1.0.1)
|
||||
axiom-types (~> 0.0.5)
|
||||
coercible (~> 1.0)
|
||||
@@ -660,4 +662,5 @@ DEPENDENCIES
|
||||
uglifier
|
||||
underscore-rails (~> 1.4.4)
|
||||
unicorn (~> 4.6.3)
|
||||
unicorn-worker-killer
|
||||
webmock
|
||||
|
||||
@@ -1,5 +1,11 @@
|
||||
# This file is used by Rack-based servers to start the application.
|
||||
|
||||
# Unicorn self-process killer
|
||||
require 'unicorn/worker_killer'
|
||||
|
||||
# # Max memory size (RSS) per worker
|
||||
use Unicorn::WorkerKiller::Oom, (200 * (1 << 20)), (250 * (1 << 20))
|
||||
|
||||
require ::File.expand_path('../config/environment', __FILE__)
|
||||
|
||||
map ENV['RAILS_RELATIVE_URL_ROOT'] || "/" do
|
||||
|
||||
Reference in New Issue
Block a user