diff options
| author | Christophe Simonis <chs@odoo.com> | 2018-10-01 16:01:54 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2018-10-01 16:01:54 +0200 |
| commit | 43b63a04656276926dfecd65d3058d6464ee8ac5 (patch) | |
| tree | d0f7c5b4a66540fa8422de2be928a30167e45eed /odoo/tools/config.py | |
| parent | b2870ae1ebc4d198c69142a2399827848d7d30b4 (diff) | |
| parent | 57e387b645200756c29423af463afe001707f2ac (diff) | |
[MERGE] forward port branch saas-11.4 up to 57e387b6452
Diffstat (limited to 'odoo/tools/config.py')
| -rw-r--r-- | odoo/tools/config.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/odoo/tools/config.py b/odoo/tools/config.py index 778fcc1def1..0f4c0d0761d 100644 --- a/odoo/tools/config.py +++ b/odoo/tools/config.py @@ -286,10 +286,12 @@ class configmanager(object): help="Specify the number of workers, 0 disable prefork mode.", type="int") group.add_option("--limit-memory-soft", dest="limit_memory_soft", my_default=2048 * 1024 * 1024, - help="Maximum allowed virtual memory per worker, when reached the worker be reset after the current request (default 671088640 aka 640MB).", + help="Maximum allowed virtual memory per worker, when reached the worker be " + "reset after the current request (default 2048MiB).", type="int") group.add_option("--limit-memory-hard", dest="limit_memory_hard", my_default=2560 * 1024 * 1024, - help="Maximum allowed virtual memory per worker, when reached, any memory allocation will fail (default 805306368 aka 768MB).", + help="Maximum allowed virtual memory per worker, when reached, any memory " + "allocation will fail (default 2560MiB).", type="int") group.add_option("--limit-time-cpu", dest="limit_time_cpu", my_default=60, help="Maximum allowed CPU time per request (default 60).", |