diff options
| author | Yorick Peterse <yorickpeterse@gmail.com> | 2016-01-20 11:49:42 +0100 |
|---|---|---|
| committer | Yorick Peterse <yorickpeterse@gmail.com> | 2016-01-20 11:51:49 +0100 |
| commit | 21fab4f41317fe3c7acc7f9395cb1222e4a41074 (patch) | |
| tree | 4b27062a3f7a609e68755656fb4d29dff4b3fb19 | |
| parent | 481644ca7c9f763d4646ad557cc3bcf8f4f71816 (diff) | |
| download | gitlab-ce-21fab4f41317fe3c7acc7f9395cb1222e4a41074.tar.gz | |
Use env variables for Unicorn memory limits
This makes it easier for users to use their own limits based on their
server configuration.
| -rw-r--r-- | config.ru | 5 | ||||
| -rw-r--r-- | doc/administration/environment_variables.md | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/config.ru b/config.ru index a2525c81361..1b258e0bd5e 100644 --- a/config.ru +++ b/config.ru @@ -7,8 +7,11 @@ if defined?(Unicorn) # Unicorn self-process killer require 'unicorn/worker_killer' + min = (ENV['GITLAB_UNICORN_MEMORY_MIN'] || 200 * 1 << 20).to_i + max = (ENV['GITLAB_UNICORN_MEMORY_MAX'] || 250 * 1 << 20).to_i + # Max memory size (RSS) per worker - use Unicorn::WorkerKiller::Oom, (200 * (1 << 20)), (250 * (1 << 20)) + use Unicorn::WorkerKiller::Oom, min, max end end diff --git a/doc/administration/environment_variables.md b/doc/administration/environment_variables.md index 1eb3a74d304..42a27dcf6d6 100644 --- a/doc/administration/environment_variables.md +++ b/doc/administration/environment_variables.md @@ -17,6 +17,8 @@ DATABASE_URL | url | For example: postgresql://localhost/blog_development?pool=5 GITLAB_EMAIL_FROM | email | Email address used in the "From" field in mails sent by GitLab GITLAB_EMAIL_DISPLAY_NAME | string | Name used in the "From" field in mails sent by GitLab GITLAB_EMAIL_REPLY_TO | email | Email address used in the "Reply-To" field in mails sent by GitLab +GITLAB_UNICORN_MEMORY_MIN | integer | The minimum memory threshold (in bytes) for the Unicorn worker killer +GITLAB_UNICORN_MEMORY_MAX | integer | The maximum memory threshold (in bytes) for the Unicorn worker killer ## Complete database variables |